diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml
index c365419..34e8622 100644
--- a/.github/workflows/docker-build-and-push.yaml
+++ b/.github/workflows/docker-build-and-push.yaml
@@ -3,8 +3,6 @@ name: docker-build-and-push
 on:
   workflow_dispatch:
   push:
-    branches:
-      - "master"
     tags:
       - 'v*'
   release:
@@ -18,9 +16,9 @@ jobs:
         dockerfile: [Dockerfile.cuda, Dockerfile.cpu]
         include:
           - dockerfile: Dockerfile.cuda
-            tag-prefix: cuda
-          - repository-name: Dockerfile.cpu
-            tag-prefix: cpu
+            tag-prefix: cuda-
+          - dockerfile: Dockerfile.cpu
+            tag-prefix: cpu-
     steps:
       - uses: actions/checkout@v4
       - name: Login to Docker Hub
@@ -35,10 +33,8 @@ jobs:
             fedirz/faster-whisper-server
           # https://github.com/docker/metadata-action?tab=readme-ov-file#flavor-input
           flavor: |
-            latest=false
             prefix=${{ matrix.tag-prefix }}
           tags: |
-            type=sha
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
       - name: Set up Docker Buildx