diff --git a/.gitea/workflows/dropshell-build.yaml b/.gitea/workflows/dropshell-build.yaml
index a89b2cc..e9591ce 100644
--- a/.gitea/workflows/dropshell-build.yaml
+++ b/.gitea/workflows/dropshell-build.yaml
@@ -44,16 +44,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Create manifest list
-        run: |
-          docker manifest create gitea.jde.nz/public/dropshell-build-base:${GITHUB_SHA} \
-            gitea.jde.nz/public/dropshell-build-base:${GITHUB_SHA}-x86_64 \
-            gitea.jde.nz/public/dropshell-build-base:${GITHUB_SHA}-aarch64
-          docker manifest push gitea.jde.nz/public/dropshell-build-base:${GITHUB_SHA}
-          
+        run: |          
           # Also tag as latest if on main branch
           if [ "$GITHUB_REF" = "refs/heads/main" ]; then
             docker manifest create gitea.jde.nz/public/dropshell-build-base:latest \
-              gitea.jde.nz/public/dropshell-build-base:${GITHUB_SHA}-x86_64 \
-              gitea.jde.nz/public/dropshell-build-base:${GITHUB_SHA}-aarch64
+              gitea.jde.nz/public/dropshell-build-base:latest-x86_64 \
+              gitea.jde.nz/public/dropshell-build-base:latest-aarch64
             docker manifest push gitea.jde.nz/public/dropshell-build-base:latest
           fi