diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 220d364ed..1b8aaa6d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,7 +78,7 @@ jobs:
             INFO_VERSION=${{ env.GIT_TAG }}-docker
           tags: |
             jasongdove/ersatztv:develop
-            jasongdove/ersatztv:${{ github.sha }}-develop
+            jasongdove/ersatztv:${{ github.sha }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
 
@@ -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 }}-nvidia
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
 
@@ -106,6 +106,6 @@ jobs:
             INFO_VERSION=${{ env.GIT_TAG }}-docker-vaapi
           tags: |
             jasongdove/ersatztv:develop-vaapi
-            jasongdove/ersatztv:${{ github.sha }}-develop-vaapi
+            jasongdove/ersatztv:${{ github.sha }}-vaapi
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 128f57594..b77cf1e1c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -111,7 +111,6 @@ jobs:
           tags: |
             jasongdove/ersatztv:latest
             jasongdove/ersatztv:${{ env.DOCKER_TAG }}
-            jasongdove/ersatztv:${{ github.sha }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
 
@@ -126,7 +125,6 @@ jobs:
           tags: |
             jasongdove/ersatztv:latest-nvidia
             jasongdove/ersatztv:${{ env.DOCKER_TAG }}-nvidia
-            jasongdove/ersatztv:${{ github.sha }}-nvidia
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
 
@@ -141,6 +139,5 @@ jobs:
           tags: |
             jasongdove/ersatztv:latest-vaapi
             jasongdove/ersatztv:${{ env.DOCKER_TAG }}-vaapi
-            jasongdove/ersatztv:${{ github.sha }}-vaapi
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache,mode=max