diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 071248ac..b4ebbb0a 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -61,7 +61,7 @@ jobs:
             # Tag major from git tags (v1.2.3 → 1)
             type=semver,pattern={{major}}
             # Tag with git SHA for tracking (first 7 characters)
-            type=sha,prefix=sha-,format=short
+            type=sha,prefix={{branch}}-,format=short
 
       # Step 6: Build the frontend first
       - name: 🎨 Build frontend
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 05552e3d..ec24b364 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -48,14 +48,14 @@ jobs:
           tags: |
             # Tag 'latest' for main branch
             type=raw,value=latest,enable={{is_default_branch}}
-            # Tag 'development' for development branch
-            type=raw,value=development,enable=${{ github.ref == 'refs/heads/development' }}
+            # Tag 'dev' for development branch
+            type=raw,value=dev,enable=${{ github.ref == 'refs/heads/development' }}
             # Semver tags for version releases (v1.0.0 -> 1.0.0, 1.0, 1)
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
             # SHA for all builds
-            type=sha,prefix={{branch}}-
+            type=sha,prefix={{branch}}-,format=short
 
       - name: Build and push Docker image
         id: build-and-push