diff --git a/.github/workflows/dockerfile-build.yaml b/.github/workflows/dockerfile-build.yaml
index 0a6f06a514..a8ff0686b8 100644
--- a/.github/workflows/dockerfile-build.yaml
+++ b/.github/workflows/dockerfile-build.yaml
@@ -31,6 +31,7 @@ jobs:
         with:
           context: .
           push: true
+          pull: true
           tags: ghcr.io/${{ github.repository }}:main
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/.github/workflows/dockerfile-cleanup.yaml b/.github/workflows/dockerfile-cleanup.yaml
index d040d980d7..8a8cc2e9fa 100644
--- a/.github/workflows/dockerfile-cleanup.yaml
+++ b/.github/workflows/dockerfile-cleanup.yaml
@@ -16,7 +16,15 @@ jobs:
       - name: Delete PR image
         uses: actions/delete-package-versions@v5
         with:
-          package-name: "zulip/docker-zulip"
+          package-name: "docker-zulip"
           package-type: "container"
           token: ${{ secrets.GITHUB_TOKEN }}
           tag-name: pr-${{ github.event.pull_request.number }}
+
+      - name: Delete untagged images from GHCR
+        uses: actions/delete-package-versions@v5
+        with:
+          package-name: "docker-zulip"
+          min-versions-to-keep: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+          delete-untagged-versions: true
diff --git a/.github/workflows/dockerfile.yaml b/.github/workflows/dockerfile.yaml
index 889a490a47..df2d02c96a 100644
--- a/.github/workflows/dockerfile.yaml
+++ b/.github/workflows/dockerfile.yaml
@@ -133,7 +133,8 @@ jobs:
                      --skip-clean-up
 
       - name: Fetch logs
-        if: always()
+        if: steps.list-changed.outputs.changed == 'true' && ( success() || failure() )
+        continue-on-error: true
         run: |
           namespace=$(helm list --all-namespaces --output json \
                     | jq -r '[.[] | select(.namespace | startswith("zulip-"))][0].namespace')