diff --git a/Makefile b/Makefile
index 6cc219e..3d43235 100644
--- a/Makefile
+++ b/Makefile
@@ -93,14 +93,14 @@ gitea-release: tools/yq/bin/yq tools/gitea-release/bin/gitea-release.sh goreleas
 	cp CHANGELOG.md .gitea-release/
 
 	# Create client-sdk-testsuite package
-	tools/yq/bin/yq -i '.version = "$(MKT_PROJECT_VERSION)"' ./misc/client-sdk-testsuite/dist/manifest.yml
+	tools/yq/bin/yq -i ".version = \"$$(MKT_PROJECT_VERSION)\"" ./misc/client-sdk-testsuite/dist/manifest.yml
 	bin/cli app package -d ./misc/client-sdk-testsuite/dist -o .gitea-release
 
 	GITEA_RELEASE_PROJECT="edge" \
 		GITEA_RELEASE_ORG="arcad" \
 		GITEA_RELEASE_BASE_URL="https://forge.cadoles.com" \
-		GITEA_RELEASE_VERSION="$(MKT_PROJECT_VERSION)" \
-		GITEA_RELEASE_NAME="$(MKT_PROJECT_VERSION)" \
+		GITEA_RELEASE_VERSION="$$(MKT_PROJECT_VERSION)" \
+		GITEA_RELEASE_NAME="$$(MKT_PROJECT_VERSION)" \
 		GITEA_RELEASE_COMMITISH_TARGET="$$(git rev-parse HEAD)" \
 		GITEA_RELEASE_IS_DRAFT="false" \
 		GITEA_RELEASE_IS_PRERELEASE="true" \
@@ -124,7 +124,7 @@ tools/modd/bin/modd:
 
 .PHONY: goreleaser
 goreleaser: .env .mktools changelog
-	( set -o allexport && source .env && set +o allexport && curl -sfL https://goreleaser.com/static/run | VERSION="$(GORELEASER_VERSION)" GORELEASER_CURRENT_TAG="$(MKT_PROJECT_VERSION)" bash /dev/stdin $(GORELEASER_ARGS) )
+	( set -o allexport && source .env && set +o allexport && curl -sfL https://goreleaser.com/static/run | VERSION="$(GORELEASER_VERSION)" GORELEASER_CURRENT_TAG="$$(MKT_PROJECT_VERSION)" bash /dev/stdin $(GORELEASER_ARGS) )
 
 .PHONY: changelog
 changelog: .mktools