diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 839ae827..8a46caf3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   # solution path doesn't need slashes unless there it is multiple folders deep
-  # solution name does not include extension. .sln is assumed  
+  # solution name does not include extension. .sln is assumed
   SOLUTION_PATH: PepperDashEssentials
   SOLUTION_FILE: PepperDashEssentials
   # Do not edit this, we're just creating it here
@@ -77,8 +77,14 @@ jobs:
           name: Version
           path: ${{env.GITHUB_HOME}}\output\version.txt
       # Create the release on the source repo
+      - name: Create tag for non-rc builds
+        if: ${{contains('alpha', env.VERSION) || contains('beta', env.VERSION)}}
+        run: |
+          git tag $($Env:VERSION)
+          git push --tags origin
       - name: Create Release
         id: create_release
+        if: ${{contains('rc' env.VERSION)}}
         # using contributor's version to allow for pointing at the right commit
         uses: fleskesvor/create-release@feature/support-target-commitish
         with:
@@ -89,6 +95,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # Upload the build package to the release
       - name: Upload Release Package
+        if: ${{contains('rc' env.VERSION)}}
         id: upload_release
         uses: actions/upload-release-asset@v1
         with: