diff --git a/.gimlet/penpot-pr.yaml b/.gimlet/penpot-pr.yaml
index c0bdc8588..d552f448e 100644
--- a/.gimlet/penpot-pr.yaml
+++ b/.gimlet/penpot-pr.yaml
@@ -5,6 +5,7 @@ namespace: penpot
 deploy:
   event: pr
 cleanup:
+  branch: "*"
   event: branchDeleted
   app: penpot-pr-{{ .BRANCH | sanitizeDNSName }}
 chart:
diff --git a/.github/workflows/cleanImages.yaml b/.github/workflows/cleanImages.yaml
deleted file mode 100644
index 9f87ccd92..000000000
--- a/.github/workflows/cleanImages.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Cleanup Images
-
-on:
-  workflow_dispatch:
-
-jobs:
-  trigger:
-    runs-on: ubuntu-latest
-    steps: 
-      - uses: actions/delete-package-versions@v5
-        with: 
-            package-name: 'tokens-studio-for-penpot'
-            package-type: 'container'
-            min-versions-to-keep: 0
-            delete-only-untagged-versions: 'true'
diff --git a/.github/workflows/cleanup.yaml b/.github/workflows/cleanup.yaml
deleted file mode 100644
index f537e69dd..000000000
--- a/.github/workflows/cleanup.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Cleanup branches
-
-on:
-  delete:
-    branches:
-     - "*"
-
-jobs:
-  trigger:
-    runs-on: ubuntu-latest
-    steps: 
-      - uses: actions/checkout@v4
-      - name: Determine the branch name
-        id: determine_branch
-        run: |
-          if [ "${{ github.event_name }}" == "pull_request" ]; then
-            echo "branch_name=${{ github.head_ref }}" >> $GITHUB_ENV
-          else
-            echo "branch_name=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
-          fi
-      - name: Replace / with - in branch name
-        id: replace_slash
-        run: |
-          SANITIZED_BRANCH_NAME=$(echo "${{ env.branch_name }}" | tr '/' '-')
-          echo "sanitized_branch_name=${SANITIZED_BRANCH_NAME}" >> $GITHUB_ENV
-
-      - name: 🍍 Deploy with Gimlet
-        uses: gimlet-io/gimlet-artifact-shipper-action@v0.8.3
-        env:
-            GIMLET_SERVER: ${{ secrets.GIMLET_SERVER }}
-            GIMLET_TOKEN: ${{ secrets.GIMLET_TOKEN }}
-      - name: Delete image
-        uses: bots-house/ghcr-delete-image-action@v1.1.0
-        with:
-          owner: tokens-studio
-          name: tokens-studio-for-penpot
-          token: ${{ secrets.PAT_TOKEN  }}
-          tag: pr-frontend-${{ env.sanitized_branch_name }}
-      - name: Delete image
-        uses: bots-house/ghcr-delete-image-action@v1.1.0
-        with:
-          owner: tokens-studio
-          name: tokens-studio-for-penpot
-          token: ${{ secrets.PAT_TOKEN  }}
-          tag: pr-backend-${{ env.sanitized_branch_name }}
\ No newline at end of file