diff --git a/.github/workflows/kcpp-build-release-win-full.yaml b/.github/workflows/kcpp-build-release-win-full.yaml
index 40a107975..3af277aef 100644
--- a/.github/workflows/kcpp-build-release-win-full.yaml
+++ b/.github/workflows/kcpp-build-release-win-full.yaml
@@ -31,14 +31,17 @@ jobs:
 
       - name: Add w64devkit to PATH
         run: |
-          $env:Path += ";$(Get-Location)\w64devkit-1.22.0\w64devkit\bin"
-          echo $env:Path
-          ls
+          echo "$(Get-Location)\w64devkit\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
 
       - name: Build Non-CUDA
         id: make_build
         run: |
           make -j ${env:NUMBER_OF_PROCESSORS}
+
+      - name: Package PyInstaller
+        id: make_pyinstaller
+        run: |
+          ./make_pyinstaller.bat
           ls
 
       # - uses: Jimver/cuda-toolkit@v0.2.11
@@ -59,3 +62,9 @@ jobs:
       #   with:
       #     name: kcpp_windows_cuda_binary
       #     path: build/bin/Release/
+
+      - name: Save artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: kcpp_windows_pyinstallers
+          path: dist/
diff --git a/make_pyinstaller_cuda.bat b/make_pyinstaller_cuda.bat
new file mode 100644
index 000000000..08ef31a2a
--- /dev/null
+++ b/make_pyinstaller_cuda.bat
@@ -0,0 +1 @@
+PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --icon "./nikogreen.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./klite.embd;." --add-data "./kcpp_docs.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./koboldcpp_vulkan_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_vulkan.dll;." --add-data "./vulkan-1.dll;." --add-data "./koboldcpp_cublas.dll;." --add-data "./cublas64_11.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cudart64_110.dll;." --add-data "./msvcp140.dll;." --add-data "./msvcp140_codecvt_ids.dll;." --add-data "./vcruntime140.dll;." --add-data "./vcruntime140_1.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp.exe"
\ No newline at end of file
diff --git a/msvcp140_codecvt_ids.dll b/msvcp140_codecvt_ids.dll
new file mode 100644
index 000000000..2fb1e6197
Binary files /dev/null and b/msvcp140_codecvt_ids.dll differ
diff --git a/make_old_pyinstaller.bat b/otherarch/tools/make_old_pyinstaller.bat
similarity index 100%
rename from make_old_pyinstaller.bat
rename to otherarch/tools/make_old_pyinstaller.bat
diff --git a/make_old_pyinstaller_cuda.bat b/otherarch/tools/make_old_pyinstaller_cuda.bat
similarity index 79%
rename from make_old_pyinstaller_cuda.bat
rename to otherarch/tools/make_old_pyinstaller_cuda.bat
index 15720fc94..4e6471269 100644
--- a/make_old_pyinstaller_cuda.bat
+++ b/otherarch/tools/make_old_pyinstaller_cuda.bat
@@ -1,4 +1,4 @@
 echo This file is only for my own usage, please do not use it. I am lazy.
 
 set PATH=d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python;d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python\\Scripts;%PATH%
-PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --icon "./nikogreen.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./klite.embd;." --add-data "./kcpp_docs.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./koboldcpp_vulkan_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_vulkan.dll;." --add-data "./vulkan-1.dll;." --add-data "./koboldcpp_cublas.dll;." --add-data "./cublas64_11.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cudart64_110.dll;." --add-data "./msvcp140.dll;." --add-data "./vcruntime140.dll;." --add-data "./vcruntime140_1.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp.exe"
\ No newline at end of file
+PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --icon "./nikogreen.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./klite.embd;." --add-data "./kcpp_docs.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./koboldcpp_vulkan_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_vulkan.dll;." --add-data "./vulkan-1.dll;." --add-data "./koboldcpp_cublas.dll;." --add-data "./cublas64_11.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cudart64_110.dll;." --add-data "./msvcp140.dll;." --add-data "./msvcp140_codecvt_ids.dll;." --add-data "./vcruntime140.dll;." --add-data "./vcruntime140_1.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp.exe"
\ No newline at end of file
diff --git a/make_pyinstaller_hybrid_henk.bat b/otherarch/tools/make_pyinstaller_hybrid_henk.bat
similarity index 100%
rename from make_pyinstaller_hybrid_henk.bat
rename to otherarch/tools/make_pyinstaller_hybrid_henk.bat