diff --git a/.github/workflows/fake-bpy-module-latest-build.yml b/.github/workflows/fake-bpy-module-latest-build.yml
index f836f568b..da91bcbff 100644
--- a/.github/workflows/fake-bpy-module-latest-build.yml
+++ b/.github/workflows/fake-bpy-module-latest-build.yml
@@ -126,13 +126,13 @@ jobs:
         with:
           password: ${{ secrets.test_pypi_token }}
           repository_url: https://test.pypi.org/legacy/
-          packages_dir: "dist/fake_bpy_modules_latest_pip_*/*/"
+          packages_dir: "dist/fake_bpy_modules_latest_pip_*/latest/"
       - name: Publish distribution 📦 to Test PyPI (Non-versioned Package)
         uses: pypa/gh-action-pypi-publish@v1.3.1
         with:
           password: ${{ secrets.test_pypi_token }}
           repository_url: https://test.pypi.org/legacy/
-          packages_dir: "dist/fake_bpy_modules_pip_*/*/"
+          packages_dir: "dist/fake_bpy_modules_latest_pip_*/non-version/"
 
   pypi_release:
     name: PyPI Release fake-bpy-module
diff --git a/src/gen_module.sh b/src/gen_module.sh
index 68e35d8af..dd3be5890 100755
--- a/src/gen_module.sh
+++ b/src/gen_module.sh
@@ -23,7 +23,7 @@ mod_version=${7:-not-specified}
 current_dir=$(pwd)
 tmp_dir=${current_dir}/${TMP_DIR_NAME}
 format="pep8"
-output_log_level="debug"
+output_log_level="warn"
 
 # find blender binary
 # shellcheck disable=SC2003,SC2308,SC2046
diff --git a/tools/pip_package/build_pip_package.sh b/tools/pip_package/build_pip_package.sh
index 84f72dff1..b6b6aad89 100755
--- a/tools/pip_package/build_pip_package.sh
+++ b/tools/pip_package/build_pip_package.sh
@@ -189,20 +189,17 @@ if [ "${deploy_stage}" = "release" ]; then
     ls -R .
     ${python_bin} setup.py sdist
     ${python_bin} setup.py bdist_wheel
+    mv dist "${release_dir}/${target_version}"
+
     # Create non-versioned package for latest release
     if [ "${target_version}" = "latest" ]; then
         export NON_VERSION_PACKAGE=1
         ${python_bin} setup.py sdist
         ${python_bin} setup.py bdist_wheel
         unset ${NON_VERSION_PACKAGE}
+        mv dist "${release_dir}/non-version"
     fi
 
-    echo "@@@"
-    ls -R dist
-
-    # move the generated package to releaes directory
-    mv dist "${release_dir}/${target_version}"
-
     # clean up
     cd "${CURRENT_DIR}"
     rm -rf "${tmp_dir}"
diff --git a/tools/pip_package/setup_blender.py b/tools/pip_package/setup_blender.py
index 58f4467a4..2c369faf4 100644
--- a/tools/pip_package/setup_blender.py
+++ b/tools/pip_package/setup_blender.py
@@ -10,7 +10,6 @@
 if "NON_VERSION_PACKAGE" in os.environ:
     if os.environ["NON_VERSION_PACKAGE"] == "1":
         module_name = f"fake-bpy-module"
-        print("TEST")
 
 # release version
 if "RELEASE_VERSION" in os.environ: