diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml
index 77efe2b..228f168 100644
--- a/.github/workflows/publish-docker-image.yml
+++ b/.github/workflows/publish-docker-image.yml
@@ -10,9 +10,11 @@ jobs:
         uses: actions/checkout@v1
       - name: Build and Push Docker Image on Tag
         uses: docker/build-push-action@v1.0.1
+        env:
+          TAG_NAME: ${{ github.event.release.tag_name }}
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: oncokb/oncokb-sop
-          tag_with_ref: true
-          push: ${{ startsWith(github.ref, 'refs/tags/v') }}
+          push: true
+          tags: oncokb/oncokb-sop:${TAG_NAME:1}