diff --git a/.gitea/workflows/dropshell-build.yaml b/.gitea/workflows/dropshell-build.yaml
index 3af32ac..5568a10 100644
--- a/.gitea/workflows/dropshell-build.yaml
+++ b/.gitea/workflows/dropshell-build.yaml
@@ -35,10 +35,13 @@ jobs:
           cd tests && ./test.sh
       - name: Publish as Latest
         run: |
-          cd build-base && \
-          SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} \
-          DOCKER_PUSH_TOKEN=${{ secrets.DOCKER_PUSH_TOKEN }} \
-          ./publish.sh
+          # Only publish on main branch
+          if [ "$GITHUB_REF" = "refs/heads/main" ]; then 
+            cd build-base && \
+            SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} \
+            DOCKER_PUSH_TOKEN=${{ secrets.DOCKER_PUSH_TOKEN }} \
+            ./publish.sh
+          fi
   create-manifest:
     needs: [build]
     runs-on: ubuntu-latest
@@ -58,15 +61,11 @@ jobs:
       - name: Create and push manifest list
         run: |
           # Only create manifest on main branch
-          if [ "$GITHUB_REF" = "refs/heads/main" ]; then
-            # Get the digest of each architecture-specific image
-            X86_64_DIGEST=$(docker manifest inspect gitea.jde.nz/public/dropshell-build-base:latest-x86_64 | jq -r '.config.digest')
-            AARCH64_DIGEST=$(docker manifest inspect gitea.jde.nz/public/dropshell-build-base:latest-aarch64 | jq -r '.config.digest')
-            
+          if [ "$GITHUB_REF" = "refs/heads/main" ]; then            
             # Create the manifest list using the architecture-specific digests
             docker manifest create gitea.jde.nz/public/dropshell-build-base:latest \
-              --amend gitea.jde.nz/public/dropshell-build-base@$X86_64_DIGEST \
-              --amend gitea.jde.nz/public/dropshell-build-base@$AARCH64_DIGEST
+              --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