diff --git a/scripts/gha/build_nswitch.sh b/scripts/gha/build_nswitch.sh
index 64926775..c93532fe 100644
--- a/scripts/gha/build_nswitch.sh
+++ b/scripts/gha/build_nswitch.sh
@@ -15,5 +15,4 @@ docker run --name xash-build --rm -v `pwd`:`pwd` -w `pwd` devkitpro/devkita64:la
 
 echo "Packaging artifacts..."
 
-find artifacts
-7z a -t7z artifacts/xash3d-fwgs-nswitch.7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -r artifacts/xash3d
+7z a -t7z artifacts/xash3d-fwgs-nswitch.7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -r pkgtemp/xash3d
diff --git a/scripts/gha/build_nswitch_docker.sh b/scripts/gha/build_nswitch_docker.sh
index ebcc4419..53698f51 100644
--- a/scripts/gha/build_nswitch_docker.sh
+++ b/scripts/gha/build_nswitch_docker.sh
@@ -33,11 +33,12 @@ echo "Building engine..."
 
 echo "Building HLSDK..."
 
-# TODO: replace with FWGS/hlsdk-portable.git when PRs are merged
-cd hlsdk-xash3d || die
+# TODO: replace with hlsdk-portable when PRs are merged
+pushd hlsdk-xash3d
 build_hlsdk hl valve
 build_hlsdk opfor gearbox
 build_hlsdk bshift bshift
+popd
 
 echo "Copying artifacts..."