diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 920949f0..5f0928ac 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -11,38 +11,27 @@ jobs:
           - os: ubuntu-18.04
             targetos: linux
             targetarch: amd64
-            artifacts: |
-              xash3d-fwgs-amd64.AppImage
-              xashds-linux-amd64
           - os: ubuntu-18.04
             targetos: linux
             targetarch: i386
-            artifacts: |
-              xash3d-fwgs-i386.AppImage
-              xashds-linux-i386
 
           - os: ubuntu-18.04
             targetos: android
             targetarch: 32
-            artifacts: xashdroid-32.apk
           - os: ubuntu-18.04
             targetos: android
             targetarch: 64
-            artifacts: xashdroid-64.apk
 
           - os: ubuntu-18.04
             targetos: motomagx
             targetarch: armv6
-            artifacts: xash3d-fwgs-magx.7z
 
           - os: windows-latest
             targetos: win32
             targetarch: amd64
-            artifacts: xash3d-fwgs-win32-amd64.7z
           - os: windows-latest
             targetos: win32
             targetarch: i386
-            artifacts: xash3d-fwgs-win32-i386.7z
     env:
       SDL_VERSION: 2.0.14
       GH_CPU_ARCH: ${{ matrix.targetarch }}
@@ -67,9 +56,9 @@ jobs:
       run: bash scripts/gha/build_${{ matrix.targetos }}.sh
 
     - name: Upload engine (prereleases)
-      run: bash scripts/continious_upload.sh ${{ join( matrix.artifacts, ' ' ) }}
+      run: bash scripts/continious_upload.sh artifacts/*
     - name: Upload engine (artifacts)
       uses: actions/upload-artifact@v2
       with:
         name: artifact-${{ matrix.targetos }}-${{ matrix.targetarch }}
-        path: ${{ matrix.artifacts }}
+        path: artifacts/*
diff --git a/scripts/gha/build_android.sh b/scripts/gha/build_android.sh
index f451b956..a5f4df5c 100755
--- a/scripts/gha/build_android.sh
+++ b/scripts/gha/build_android.sh
@@ -14,8 +14,12 @@ fi
 
 sh compile.sh release
 
+popd
+
+mkdir -p artifacts/
+
 if [[ "$GH_CPU_ARCH" == "64" ]]; then
-	mv xashdroid.apk ../xashdroid-64.apk
+	mv android/xashdroid.apk artifacts/xashdroid-64.apk
 else
-	mv xashdroid.apk ../xashdroid-32.apk
+	mv android/xashdroid.apk artifacts/xashdroid-32.apk
 fi
diff --git a/scripts/gha/build_linux.sh b/scripts/gha/build_linux.sh
index 77910f98..99e76d43 100755
--- a/scripts/gha/build_linux.sh
+++ b/scripts/gha/build_linux.sh
@@ -104,11 +104,14 @@ EOF
 	./appimagetool.AppImage "$APPDIR" "$APPIMAGE"
 }
 
+mkdir -p artifacts/
+
 rm -rf build # clean-up build directory
 build_engine dedicated
-mv build/engine/xash xashds-linux-$ARCH
+mv build/engine/xash artifacts/xashds-linux-$ARCH
 
 rm -rf build
 build_sdl2
 build_engine full
 build_appimage
+mv $APPIMAGE artifacts/
diff --git a/scripts/gha/build_motomagx.sh b/scripts/gha/build_motomagx.sh
index 06c06e7d..8ab397a1 100755
--- a/scripts/gha/build_motomagx.sh
+++ b/scripts/gha/build_motomagx.sh
@@ -8,9 +8,9 @@ cd $GITHUB_WORKSPACE
 mkdir -p Xash/valve/cl_dlls
 mkdir -p Xash/valve/dlls
 
-cd hlsdk
+pushd hlsdk
 ./waf configure -T fast --enable-magx --enable-simple-mod-hacks build install --destdir=../Xash || die
-cd ../
+popd
 
 ./waf configure -T fast --enable-magx build install --destdir=Xash/ || die
 
@@ -30,4 +30,6 @@ exec $mypath/xash -dev $@
 EOF
 
 
-7z a -t7z $GITHUB_WORKSPACE/xash3d-fwgs-magx.7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -r Xash/
+mkdir -p artifacts/
+
+7z a -t7z artifacts/xash3d-fwgs-magx.7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -r Xash/
diff --git a/scripts/gha/build_win32.sh b/scripts/gha/build_win32.sh
index b99da3ea..ad11f6bc 100755
--- a/scripts/gha/build_win32.sh
+++ b/scripts/gha/build_win32.sh
@@ -24,4 +24,5 @@ else
 	die
 fi
 
-7z a -t7z $BUILDDIR/xash3d-fwgs-win32-$ARCH.7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on *.dll *.exe *.pdb
+mkdir -p artifacts/
+7z a -t7z artifacts/xash3d-fwgs-win32-$ARCH.7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on *.dll *.exe *.pdb