diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
index 0d4f6c56b..78a874cec 100644
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.9'
       - uses: actions/setup-node@v4
         with:
           node-version: 22.14.0
@@ -18,61 +18,62 @@ jobs:
         run: |
           set -ex
           mkdir /tmp/sdists
-          python grr/proto/setup.py --quiet sdist --formats=zip --dist-dir="/tmp/sdists"
-          python grr/core/setup.py --quiet sdist --formats=zip --dist-dir="/tmp/sdists"
-          python grr/client/setup.py --quiet sdist --formats=zip --dist-dir="/tmp/sdists"
-          python grr/client_builder/setup.py --quiet sdist --formats=zip --dist-dir="/tmp/sdists"
-          python grr/server/setup.py --quiet sdist --formats=zip --dist-dir="/tmp/sdists"
-          python grr/test/setup.py --quiet sdist --formats=zip --dist-dir="/tmp/sdists"
-          python colab/setup.py --quiet sdist --formats=zip --dist-dir="/tmp/sdists"
-          python api_client/python/setup.py --quiet sdist --formats=zip --dist-dir="/tmp/sdists"
+          python grr/proto/setup.py --quiet sdist --dist-dir="/tmp/sdists"
+          python grr/core/setup.py --quiet sdist --dist-dir="/tmp/sdists"
+          python grr/client/setup.py --quiet sdist --dist-dir="/tmp/sdists"
+          python grr/client_builder/setup.py --quiet sdist --dist-dir="/tmp/sdists"
+          python grr/server/setup.py --quiet sdist --dist-dir="/tmp/sdists"
+          python grr/test/setup.py --quiet sdist --dist-dir="/tmp/sdists"
+          python colab/setup.py --quiet sdist --dist-dir="/tmp/sdists"
+          python api_client/python/setup.py --quiet sdist --dist-dir="/tmp/sdists"
+          ls -lha /tmp/sdists/
       - name: Upload grr-response-proto
         uses: actions/upload-artifact@v4
         with:
           name: grr-response-proto
-          path: /tmp/sdists/grr-response-proto-[0-9]*.zip
+          path: /tmp/sdists/grr_response_proto-*.tar.gz
           retention-days: 3          
       - name: Upload grr-response-core
         uses: actions/upload-artifact@v4
         with:
           name: grr-response-core
-          path: /tmp/sdists/grr-response-core-[0-9]*.zip
+          path: /tmp/sdists/grr_response_core-*.tar.gz
           retention-days: 3          
       - name: Upload grr-response-client
         uses: actions/upload-artifact@v4
         with:
           name: grr-response-client
-          path: /tmp/sdists/grr-response-client-[0-9]*.zip
+          path: /tmp/sdists/grr_response_client-*.tar.gz
           retention-days: 3          
       - name: Upload grr-response-client-builder
         uses: actions/upload-artifact@v4
         with:
           name: grr-response-client-builder
-          path: /tmp/sdists/grr-response-client-builder-[0-9]*.zip
+          path: /tmp/sdists/grr_response_client_builder-*.tar.gz
           retention-days: 3          
       - name: Upload grr-response-server
         uses: actions/upload-artifact@v4
         with:
           name: grr-response-server
-          path: /tmp/sdists/grr-response-server-[0-9]*.zip
+          path: /tmp/sdists/grr_response_server-*.tar.gz
           retention-days: 3              
       - name: Upload grr-response-test
         uses: actions/upload-artifact@v4
         with:
           name: grr-response-test
-          path: /tmp/sdists/grr-response-test-[0-9]*.zip
+          path: /tmp/sdists/grr_response_test-*.tar.gz
           retention-days: 3
       - name: Upload grr-colab
         uses: actions/upload-artifact@v4
         with:
           name: grr-colab
-          path: /tmp/sdists/grr-colab-[0-9]*.zip
+          path: /tmp/sdists/grr_colab-*.tar.gz
           retention-days: 3          
       - name: Upload grr-api-client
         uses: actions/upload-artifact@v4
         with:
           name: grr-api-client
-          path: /tmp/sdists/grr-api-client-[0-9]*.zip
+          path: /tmp/sdists/grr_api_client-*.tar.gz
           retention-days: 3          
   
   publish-to-pypi-grr-response-proto: