diff --git a/.github/workflows/_extension_deploy.yml b/.github/workflows/_extension_deploy.yml
index 71440e1..b9912f2 100644
--- a/.github/workflows/_extension_deploy.yml
+++ b/.github/workflows/_extension_deploy.yml
@@ -107,9 +107,10 @@ jobs:
           BUCKET_NAME: ${{ secrets.S3_DUCKDB_ORG_BUCKET }}
           DUCKDB_EXTENSION_SIGNING_PK: ${{ secrets.S3_DUCKDB_ORG_EXTENSION_SIGNING_PK }}
           DUCKDB_DEPLOY_SCRIPT_MODE: for_real
+          PIP_BREAK_SYSTEM_PACKAGES: 1
         run: |
           pwd
-          python3 -m pip install pip awscli
+          python3 -m pip install awscli
           git config --global --add safe.directory '*'
           cd duckdb
           git fetch --tags
diff --git a/.github/workflows/_extension_distribution.yml b/.github/workflows/_extension_distribution.yml
index 1cad557..1d4eb05 100644
--- a/.github/workflows/_extension_distribution.yml
+++ b/.github/workflows/_extension_distribution.yml
@@ -208,7 +208,14 @@ jobs:
     steps:
       - name: Free up some unused space
         run: |
-          docker rmi $(docker images -a -q)
+          docker images -a -q > package.list
+          if [ -s package.list ]; then
+              echo "To be deleted"
+              cat package.list
+              echo "---"
+              docker rmi $(cat package.list)
+          fi
+          rm package.list
 
       - uses: actions/checkout@v4
         name: Checkout override repository