diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 743bd75..f286e14 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,7 +4,7 @@ on:
   push:
     paths:
       - "Dockerfile"  # Trigger only when the Dockerfile is modified
-      - ".github/workflows/docker.yml"
+      - ".github/workflows/docker.yml"  # Also triggers when the workflow itself is updated
 
 env:
   IMAGE_NAME: ghcr.io/retrodeck-builder:${{ github.sha }}  # Image name with SHA tag
@@ -32,8 +32,8 @@ jobs:
         run: |
           docker push $IMAGE_NAME
 
-      - name: Tag as Latest (optional)
+      - name: Tag as Latest
         if: github.ref == 'refs/heads/main'  # Only tag as 'latest' on the main branch
         run: |
-          docker tag $IMAGE_NAME ghcr.io/retrodeck:latest
-          docker push ghcr.io/retrodeck:latest
+          docker tag $IMAGE_NAME ghcr.io/retrodeck-builder:latest
+          docker push ghcr.io/retrodeck-builder:latest