diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index db6dbb00..141d19a6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -425,10 +425,6 @@ jobs:
         author_name: Failure in publishing SDK
         fields: repo,commit,author,action
         status: ${{ job.status }}
-    - if: success() && github.event_name == 'push'
-      name: Add SDK version tag
-      run: git tag sdk/${{ github.ref_name }} && git push origin sdk/${{ github.ref_name
-        }}
     strategy:
       fail-fast: true
       matrix:
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 3d801da4..2012eec6 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -425,10 +425,6 @@ jobs:
         author_name: Failure in publishing SDK
         fields: repo,commit,author,action
         status: ${{ job.status }}
-    - if: success() && github.event_name == 'push'
-      name: Add SDK version tag
-      run: git tag sdk/${{ github.ref_name }} && git push origin sdk/${{ github.ref_name
-        }}
     strategy:
       fail-fast: true
       matrix:
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 8296982c..54bf79eb 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -371,10 +371,6 @@ jobs:
         author_name: Failure in publishing SDK
         fields: repo,commit,author,action
         status: ${{ job.status }}
-    - if: success() && github.event_name == 'push'
-      name: Add SDK version tag
-      run: git tag sdk/${{ github.ref_name }} && git push origin sdk/${{ github.ref_name
-        }}
     strategy:
       fail-fast: true
       matrix:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 33fc477e..c356aa0e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -100,7 +100,7 @@ jobs:
         - "3.7"
   create_docs_build:
     name: create_docs_build
-    needs: publish_sdk
+    needs: tag_sdk
     runs-on: ubuntu-latest
     steps:
     - name: Install pulumictl
@@ -383,10 +383,6 @@ jobs:
         author_name: Failure in publishing SDK
         fields: repo,commit,author,action
         status: ${{ job.status }}
-    - if: success() && github.event_name == 'push'
-      name: Add SDK version tag
-      run: git tag sdk/${{ github.ref_name }} && git push origin sdk/${{ github.ref_name
-        }}
     strategy:
       fail-fast: true
       matrix:
@@ -398,6 +394,20 @@ jobs:
         - 14.x
         pythonversion:
         - "3.7"
+  tag_sdk:
+    name: tag_sdk
+    needs: publish_sdk
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v2
+    - name: Install pulumictl
+      uses: jaxxstorm/action-install-gh-release@v1.2.0
+      with:
+        repo: pulumi/pulumictl
+    - name: Add SDK version tag
+      run: git tag sdk/$(pulumictl get version --language generic) && git push origin
+        sdk/$(pulumictl get version --language generic)
   test:
     name: test
     needs: build_sdk