diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index cf01982f..a43ebf50 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -78,14 +78,14 @@ jobs:
           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)}}
+        if: contains('-alpha-', env.VERSION) || contains('-beta-', env.VERSION)
         run: |
           git tag $($Env:VERSION)
           git push --tags origin
       - name: Create Release
         id: create_release
         # using contributor's version to allow for pointing at the right commit
-        if: ${{contains('rc', env.VERSION)}}
+        if: contains('-rc-', env.VERSION) || contains('-hotfix-', env.VERSION)
         uses: fleskesvor/create-release@feature/support-target-commitish
         with:
           tag_name: ${{ env.VERSION  }}
@@ -95,7 +95,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # Upload the build package to the release
       - name: Upload Release Package
-        if: ${{contains('rc', env.VERSION)}}
+        if: contains('-rc-', env.VERSION) || contains('-hotfix-', env.VERSION)
         id: upload_release
         uses: actions/upload-release-asset@v1
         with: