diff --git a/.github/workflows/build_linux_amd64.yml b/.github/workflows/build_linux_amd64.yml
index e30a106e..752779c3 100644
--- a/.github/workflows/build_linux_amd64.yml
+++ b/.github/workflows/build_linux_amd64.yml
@@ -81,3 +81,12 @@ jobs:
         - name: Build
           working-directory: ${{runner.workspace}}/build
           run: cmake --build . --config Release
+
+        - name: Create Archive
+          run: $Env:GITHUB_WORKSPACE/make_windows_package.ps1 ${{runner.workspace}}/build $Env:GITHUB_WORKSPACE/root
+
+        - name: Save Archive
+          uses: actions/upload-artifact@v2
+          with:
+              name: sdrpp_windows_x64
+              path: ${{runner.workspace}}/sdrpp_windows_x64.zip
\ No newline at end of file
diff --git a/make_windows_package.ps1 b/make_windows_package.ps1
index fe90adc3..a3a144e9 100644
--- a/make_windows_package.ps1
+++ b/make_windows_package.ps1
@@ -1,48 +1,51 @@
+$build_dir=$args[0]
+$root_dir=$args[1]
+
 mkdir sdrpp_windows_x64
 
 # Copy root
-cp -Recurse root/* sdrpp_windows_x64/
+cp -Recurse $root_dir/* sdrpp_windows_x64/
 
 # Copy core
-cp build/Release/* sdrpp_windows_x64/
+cp $build_dir/Release/* sdrpp_windows_x64/
 cp 'C:/Program Files/PothosSDR/bin/volk.dll' sdrpp_windows_x64/
 
 # Copy modules
-cp build/radio/Release/radio.dll sdrpp_windows_x64/modules/
+cp $build_dir/radio/Release/radio.dll sdrpp_windows_x64/modules/
 
-cp build/recorder/Release/recorder.dll sdrpp_windows_x64/modules/
+cp $build_dir/recorder/Release/recorder.dll sdrpp_windows_x64/modules/
 
-cp build/airspyhf_source/Release/airspyhf_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/airspyhf_source/Release/airspyhf_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/airspyhf.dll' sdrpp_windows_x64/
 
-cp build/airspy_source/Release/airspy_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/airspy_source/Release/airspy_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/airspy.dll' sdrpp_windows_x64/
 
-cp build/hackrf_source/Release/hackrf_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/hackrf_source/Release/hackrf_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/hackrf.dll' sdrpp_windows_x64/
 
-cp build/rtl_sdr_source/Release/rtl_sdr_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/rtl_sdr_source/Release/rtl_sdr_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/rtlsdr.dll' sdrpp_windows_x64/
 
-cp build/plutosdr_source/Release/plutosdr_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/plutosdr_source/Release/plutosdr_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/libiio.dll' sdrpp_windows_x64/
 cp 'C:/Program Files/PothosSDR/bin/libad9361.dll' sdrpp_windows_x64/
 
-cp build/rtl_tcp_source/Release/rtl_tcp_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/rtl_tcp_source/Release/rtl_tcp_source.dll sdrpp_windows_x64/modules/
 
-cp build/soapy_source/Release/soapy_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/soapy_source/Release/soapy_source.dll sdrpp_windows_x64/modules/
 
-cp build/file_source/Release/file_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/file_source/Release/file_source.dll sdrpp_windows_x64/modules/
 
-cp build/sdrplay_source/Release/sdrplay_source.dll sdrpp_windows_x64/modules/
+cp $build_dir/sdrplay_source/Release/sdrplay_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/SDRplay/API/x64/sdrplay_api.dll' sdrpp_windows_x64/
 
-cp build/meteor_demodulator/Release/meteor_demodulator.dll sdrpp_windows_x64/modules/
+cp $build_dir/meteor_demodulator/Release/meteor_demodulator.dll sdrpp_windows_x64/modules/
 
-cp build/audio_sink/Release/audio_sink.dll sdrpp_windows_x64/modules/
+cp $build_dir/audio_sink/Release/audio_sink.dll sdrpp_windows_x64/modules/
 cp "C:/Program Files (x86)/RtAudio/bin/rtaudio.dll" sdrpp_windows_x64/
 
-cp build/discord_integration/Release/discord_integration.dll sdrpp_windows_x64/modules/
+cp $build_dir/discord_integration/Release/discord_integration.dll sdrpp_windows_x64/modules/
 
 # Copy supporting libs
 cp 'C:/Program Files/PothosSDR/bin/libusb-1.0.dll' sdrpp_windows_x64/