diff --git a/.gitea/workflows/dropshell-build.yaml b/.gitea/workflows/dropshell-build.yaml
index e9591ce..576b6bb 100644
--- a/.gitea/workflows/dropshell-build.yaml
+++ b/.gitea/workflows/dropshell-build.yaml
@@ -43,12 +43,28 @@ jobs:
     needs: [build]
     runs-on: ubuntu-latest
     steps:
-      - name: Create manifest list
-        run: |          
-          # Also tag as latest if on main branch
+      - name: Login to Gitea
+        uses: docker/login-action@v3
+        with:
+          registry: gitea.jde.nz
+          username: DoesntMatter
+          password: ${{ secrets.DOCKER_PUSH_TOKEN }}
+          
+      - name: Create and push manifest list
+        run: |
+          # Only create manifest on main branch
           if [ "$GITHUB_REF" = "refs/heads/main" ]; then
+            # Pull the architecture-specific images first to ensure they're available
+            docker pull gitea.jde.nz/public/dropshell-build-base:latest-x86_64
+            docker pull gitea.jde.nz/public/dropshell-build-base:latest-aarch64
+            
+            # Create the manifest list
             docker manifest create gitea.jde.nz/public/dropshell-build-base:latest \
-              gitea.jde.nz/public/dropshell-build-base:latest-x86_64 \
-              gitea.jde.nz/public/dropshell-build-base:latest-aarch64
+              --amend gitea.jde.nz/public/dropshell-build-base:latest-x86_64 \
+              --amend gitea.jde.nz/public/dropshell-build-base:latest-aarch64
+              
+            # Push the manifest list
             docker manifest push gitea.jde.nz/public/dropshell-build-base:latest
+            
+            echo "Manifest list created and pushed successfully"
           fi