diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2adb6e9b7..35453fc50 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -93,15 +93,16 @@ jobs:
     - name: "release: merge dev -> master and promote dev"
       if: startsWith(github.ref, 'refs/tags/') && github.event_name == 'push'  
       run: |
+        TAG=${GITHUB_REF#refs/*/}
         git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
         git config --local user.name "github-actions[bot]"
         git fetch origin
         git checkout master
-        git merge -m 'chore: merge dev to master' dev
+        git merge -m 'chore: merge dev to master' origin/dev
         git push origin master
         git checkout dev
-        jq '.version = "${{ needs.release-please.outputs.version }}-dev"' package.json > package.json.tmp
-        jq '.version = "${{ needs.release-please.outputs.version }}-dev"' package-lock.json > package-lock.json.tmp
+        jq ".version = \"$TAG-dev\"" package.json > package.json.tmp
+        jq ".version = \"$TAG-dev\"" package-lock.json > package-lock.json.tmp
         mv package.json.tmp package.json
         mv package-lock.json.tmp package-lock.json
         git add -A