diff --git a/.github/workflows/cleanup_images.yml b/.github/workflows/cleanup_images.yml
index 98f614a8..3a51f984 100644
--- a/.github/workflows/cleanup_images.yml
+++ b/.github/workflows/cleanup_images.yml
@@ -28,12 +28,12 @@ jobs:
       - name: Get package names from bake definition
         env:
           JQ_FILTER: >-
-            .target[]
-            | select(.output | index("type=docker")).tags[]
-            | split("/")[-1]
-            | split(":")[0]
+            .target
+            | map(select(.output | index("type=docker")))
+            | map(.tags[] | split("/")[-1] | split(":")[0])
+            | join(",")
         run: |
-          echo PACKAGE_NAMES=$(docker buildx bake --print | jq '${{ env.JQ_FILTER }}' | jq -rn  '[inputs] | join(",")') >> $GITHUB_ENV
+          echo PACKAGE_NAMES=$(docker buildx bake --print | jq '${{ env.JQ_FILTER }}') >> $GITHUB_ENV
       - name: Remove tag ${{format('pr-{0}', github.event.pull_request.number)}} after PR is closed
         uses: dataaxiom/ghcr-cleanup-action@98b4022383d6ddb70ccbf6a378b4d8c67a60f066 # v1.0.13
         if: github.event_name == 'pull_request'