diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 33b17e8..a759871 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -51,7 +51,10 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
+            # Latest tag for version tags
             type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
+            # Nightly tag for main branch pushes
+            type=raw,value=nightly,enable=${{ github.ref == 'refs/heads/main' }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
@@ -106,9 +109,13 @@ jobs:
         with:
           images: ${{ env.DOCKER_HUB_ORGANIZATION }}/claudecode
           tags: |
-            type=ref,event=branch,suffix=-staging
             type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            # Latest tag for version tags
             type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
+            # Nightly tag for main branch pushes
+            type=raw,value=nightly,enable=${{ github.ref == 'refs/heads/main' }}
 
       - name: Build and push Claude Code Docker image
         uses: docker/build-push-action@v6