diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
index e163f245..04ed0707 100644
--- a/.github/workflows/test-and-deploy.yml
+++ b/.github/workflows/test-and-deploy.yml
@@ -130,6 +130,11 @@ jobs:
           name: dist-artifacts-${{ matrix.os }}-${{ matrix.python }}
           path: dist
 
+      # Output the artifact name for later use
+      - name: Set output
+        id: set_output
+        run: echo "dist-artifacts-${{ matrix.os }}-${{ matrix.python }}" >> $GITHUB_ENV
+
   build-macos:
     strategy:
       matrix:
@@ -161,6 +166,11 @@ jobs:
           name: dist-artifacts-${{ matrix.os }}-${{ matrix.python }}
           path: dist/*
 
+      # Output the artifact name for later use
+      - name: Set output
+        id: set_output
+        run: echo "dist-artifacts-${{ matrix.os }}-${{ matrix.python }}" >> $GITHUB_ENV
+
   build-linux:
     strategy:
         matrix:
@@ -210,6 +220,11 @@ jobs:
           name: dist-artifacts-manylinux-${{ matrix.python }}
           path: dist/*
 
+      # Output the artifact name for later use
+      - name: Set output
+        id: set_output
+        run: echo "dist-artifacts-manylinux-${{ matrix.python }}" >> $GITHUB_ENV
+
   deploy:
     runs-on: ubuntu-latest
     needs: [test-windows, test-linux, test-macos, build-linux, build-windows, build-macos]
@@ -232,6 +247,15 @@ jobs:
         with:
           path: dist
 
+      - name: Get artifact names
+        run: |
+          # Read the artifact_name output from the build job
+          ARTIFACT_NAME=$(grep 'artifact_name=' $GITHUB_ENV | cut -d= -f2)
+
+          # Download artifacts without additional subdirectories
+          mkdir -p dist
+          mv dist/$ARTIFACT_NAME/* dist/
+
       - name: Inspect wheel files
         run: |
           ls -R dist