diff --git a/.github/workflows/cd_release.yml b/.github/workflows/cd_release.yml
index 8e7696e7d..2c2269681 100644
--- a/.github/workflows/cd_release.yml
+++ b/.github/workflows/cd_release.yml
@@ -241,11 +241,12 @@ jobs:
       with:
         path: dist
 
-    - name: Move sdist files to dist/m wheel files already there
+    - name: Move sdists and wheels to dist and remove all directories
       run: |
         ls -lah dist
         mv dist/sdist_____/* dist/
-        rm -rf dist/sdist_____
+        mv dist/wheels*/* dist/
+        find . -mindepth 1 -maxdepth 1 -type d -exec rm -rf {} +
         ls -lah dist
 
     # - name: Publish package to Test PyPI