diff --git a/release.yaml b/release.yaml
index dac798c4b81..a1d5248c64e 100644
--- a/release.yaml
+++ b/release.yaml
@@ -254,8 +254,9 @@ promoteToPublic:
           # we need to first fetch the branch because the repo in CI is in a detached state
           git fetch origin '+refs/heads/{{git.branch}}:refs/heads/{{git.branch}}'
           git checkout {{git.branch}}
-          git tag {{version}}
-          git push origin {{git.branch}} --tags
+          git tag --force {{version}}
+          # only push a single tag
+          git push origin tag {{version}}
 
           # Annotate build
           cat << EOF | buildkite-agent annotate --style info
@@ -290,7 +291,7 @@ promoteToPublic:
             - [Release post](https://sourcegraph.com/blog/release/${month_name}-${current_year})
           EndOfText
 
-          bazel run //dev/tools:gh -- release create ${version} --latest --verify-tag -t "Sourcegraph ${tag}" --generate-notes --notes "${releasepost}"
+          bazel run //dev/tools:gh -- release create ${version} --latest --verify-tag -t "Sourcegraph ${tag}" --notes "${releasepost}"
 
       # tag is usually in the format `5.3.2`
       # while version is usually the tag prepended with a v, `v5.3.2`
@@ -339,7 +340,7 @@ promoteToPublic:
           chmod +x changelog
 
           pr_url=$(./changelog \
-            --github.token="$DEVX_GH_TOKEN" \
+            --github.token="$DEVX_SERVICE_GH_TOKEN" \
             update-as-pr \
             --github.repo="sourcegraph/sourcegraph" \
             --output.repo="sourcegraph/docs" \