diff --git a/.github/workflows/dockerfile-cleanup.yaml b/.github/workflows/dockerfile-cleanup.yaml
index be3c40d7a4..0ae1188eb6 100644
--- a/.github/workflows/dockerfile-cleanup.yaml
+++ b/.github/workflows/dockerfile-cleanup.yaml
@@ -13,13 +13,22 @@ jobs:
     permissions:
       packages: write
     steps:
+      - id: get-version-id
+        name: Get PR image version-id
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          VERSION_ID=$(gh api '/orgs/zulip/packages/container/docker-zulip/versions' | jq '.[] | select(.metadata.container.tags | any(index("pr-${{github.event.pull_request.number }}"))) | .id')
+          echo "VERSION_ID=$VERSION_ID" >> $GITHUB_OUTPUT
+
       - name: Delete PR image
         uses: actions/delete-package-versions@v5
+        if: steps.get-version-id.outputs.VERSION_ID != ''
         with:
           package-name: "docker-zulip"
           package-type: "container"
+          package-version-ids: ${{ steps.get-version-id.outputs.VERSION_ID }}
           token: ${{ secrets.GITHUB_TOKEN }}
-          tag-name: pr-${{ github.event.pull_request.number }}
 
       - name: Delete untagged images from GHCR
         uses: actions/delete-package-versions@v5