diff --git a/.github/workflows/publish-latest-dashboard-and-server-docker.yml b/.github/workflows/publish-latest-dashboard-and-server-docker.yml
index 2e3f8e719..f98b3f46f 100644
--- a/.github/workflows/publish-latest-dashboard-and-server-docker.yml
+++ b/.github/workflows/publish-latest-dashboard-and-server-docker.yml
@@ -48,9 +48,10 @@ jobs:
           file: ./docker/Dockerfile-elsa-dashboard-and-server
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
+          images: |
+            elsaworkflows/elsa-dashboard-and-server
           tags: |
-            - elsaworkflows/elsa-dashboard-and-server:latest
-            - elsaworkflows/elsa-dashboard-and-server:${{ github.run_number }}
+            type=sha
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
 
diff --git a/.github/workflows/publish-latest-dashboard-docker.yml b/.github/workflows/publish-latest-dashboard-docker.yml
index 2de73175f..56fa31f8f 100644
--- a/.github/workflows/publish-latest-dashboard-docker.yml
+++ b/.github/workflows/publish-latest-dashboard-docker.yml
@@ -49,8 +49,8 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: |
-            - elsaworkflows/elsa-dashboard:latest
-            - elsaworkflows/elsa-dashboard:${{ github.run_number }}
+            elsaworkflows/elsa-dashboard:latest
+            elsaworkflows/elsa-dashboard:${{ github.run_number }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
 
diff --git a/.github/workflows/publish-latest-server-docker.yml b/.github/workflows/publish-latest-server-docker.yml
index fcf1de3af..30ef9d5c2 100644
--- a/.github/workflows/publish-latest-server-docker.yml
+++ b/.github/workflows/publish-latest-server-docker.yml
@@ -49,8 +49,8 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: |
-            - elsaworkflows/elsa-server:latest
-            - elsaworkflows/elsa-server:${{ github.run_number }}
+            elsaworkflows/elsa-server:latest
+            elsaworkflows/elsa-server:${{ github.run_number }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache