diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index b633d290..07fe2151 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           path: |
-            dist/*/*.tar.gz
+            dist/*.tar.gz
 
     env:
       PSYCOPG2_TESTDB: postgres
@@ -95,7 +95,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           path: |
-            dist/*/*${{ matrix.tag }}_${{ matrix.arch }}.whl
+            dist/*.whl
 
     services:
       postgresql:
diff --git a/scripts/build/build_manylinux2014.sh b/scripts/build/build_manylinux2014.sh
index ba32e473..49a2d337 100755
--- a/scripts/build/build_manylinux2014.sh
+++ b/scripts/build/build_manylinux2014.sh
@@ -22,7 +22,7 @@ fi
 # Find psycopg version
 version=$(grep -e ^PSYCOPG_VERSION "${prjdir}/setup.py" | sed "s/.*'\(.*\)'/\1/")
 # A gratuitous comment to fix broken vim syntax file: '")
-distdir="${prjdir}/dist/psycopg2-$version"
+distdir="${prjdir}/dist"
 
 # Replace the package name
 if [[ "${PACKAGE_NAME:-}" ]]; then
diff --git a/scripts/build/build_sdist.sh b/scripts/build/build_sdist.sh
index 6408cac9..42c46db5 100755
--- a/scripts/build/build_sdist.sh
+++ b/scripts/build/build_sdist.sh
@@ -9,7 +9,7 @@ prjdir="$( cd "${dir}/../.." && pwd )"
 # Find psycopg version
 version=$(grep -e ^PSYCOPG_VERSION setup.py | sed "s/.*'\(.*\)'/\1/")
 # A gratuitous comment to fix broken vim syntax file: '")
-distdir="${prjdir}/dist/psycopg2-$version"
+distdir="${prjdir}/dist"
 
 # Replace the package name
 if [[ "${PACKAGE_NAME:-}" ]]; then