diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7e0e657f5af..b1fe018b1bd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -76,6 +76,17 @@ jobs:
           command: 'bazel run //:buildifier_check ||
           (echo "ERROR: Bazel files not formatted, please run \`bazel run :buildifier\`" >&2; exit 1)'
           when: always
+  write_release_version:
+    docker:
+      - image: docker:git
+    working_directory: /src
+    steps:
+      - checkout
+      - run: git describe --tags --abbrev=0 > VERSION
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - VERSION
   build_linux_release:
     docker:
       - image: jfbrandhorst/grpc-gateway-build-env
@@ -147,13 +158,12 @@ jobs:
       - image: cibuilds/github:0.10
     steps:
       - attach_workspace:
-          at: ./release
-      - checkout
+          at: /workspace
       - run:
           name: "Publish Release on GitHub"
           command: |
-            VERSION=$(git describe --tags --abbrev=0)
-            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${VERSION} ./release/
+            VERSION=$(cat /workspace/VERSION)
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} /workspace/release/
 workflows:
   version: 2
   all:
@@ -164,6 +174,12 @@ workflows:
       - generate
       - lint
       - bazel
+      - write_release_version:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v\d+\.\d+\.\d+$/
       - build_linux_release:
           filters:
             branches:
@@ -184,6 +200,7 @@ workflows:
               only: /^v\d+\.\d+\.\d+$/
       - publish_github_release:
           requires:
+            - write_release_version
             - build_linux_release
             - build_darwin_release
             - build_windows_release