diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2ebedfcd6..220d364ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
     name: Build & Publish to Docker Hub
     needs: build_and_test
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'push' }}
+    if: github.event_name == 'push' && !contains(github.event.head_commit.message, '[no ci]')
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -92,7 +92,7 @@ jobs:
             INFO_VERSION=${{ env.GIT_TAG }}-docker-nvidia
           tags: |
             jasongdove/ersatztv:develop-nvidia
-            jasongdove/ersatztv:{{ github.sha }}-develop-nvidia
+            jasongdove/ersatztv:${{ github.sha }}-develop-nvidia
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache,mode=max