diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a41e5cb7..deb153be2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,8 +92,8 @@ jobs:
           build-args: |
             INFO_VERSION=${{ env.GIT_TAG }}-docker-nvidia
           tags: |
-            jasongdove/ersatztv-nvidia:develop
-            jasongdove/ersatztv-nvidia:${{ github.sha }}
+            jasongdove/ersatztv:develop-nvidia
+            jasongdove/ersatztv:${{ github.sha }}-nvidia
 
       - name: Build and push vaapi
         uses: docker/build-push-action@v2
@@ -105,5 +105,5 @@ jobs:
           build-args: |
             INFO_VERSION=${{ env.GIT_TAG }}-docker-vaapi
           tags: |
-            jasongdove/ersatztv-vaapi:develop
-            jasongdove/ersatztv-vaapi:${{ github.sha }}
+            jasongdove/ersatztv:develop-vaapi
+            jasongdove/ersatztv:${{ github.sha }}-vaapi