diff --git a/.github/workflows/build-switch.yml b/.github/workflows/build-switch.yml
index 46e1d501..f7201fa3 100644
--- a/.github/workflows/build-switch.yml
+++ b/.github/workflows/build-switch.yml
@@ -1,28 +1,47 @@
 name: re3 cmake devkitA64 (Nintendo Switch)
+
 on:
   pull_request:
   push:
+    branches: [ main, master ]
   release:
-    types: published
+    types: [ published ]
+
 jobs:
   build-nintendo-switch:
     runs-on: ubuntu-latest
     container: devkitpro/devkita64:latest
+    
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
-          submodules: 'true'
-      - name: "Build files"
+          submodules: 'recursive'
+          fetch-depth: 0
+          
+      - name: Build files
         run: |
-          /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake -S. -Bbuild -DRE3_AUDIO=OAL -DLIBRW_PLATFORM=GL3 -DLIBRW_GL3_GFXLIB=GLFW -DRE3_WITH_OPUS=False -DRE3_VENDORED_LIBRW=True -DRE3_INSTALL=True
-          cmake --build build --parallel
-      - name: "Create binary package (cpack)"
+          mkdir -p build
+          cd build
+          /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-cmake \
+            -DRE3_AUDIO=OAL \
+            -DLIBRW_PLATFORM=GL3 \
+            -DLIBRW_GL3_GFXLIB=GLFW \
+            -DRE3_WITH_OPUS=False \
+            -DRE3_VENDORED_LIBRW=True \
+            -DRE3_INSTALL=True \
+            ..
+          cmake --build . --parallel $(nproc)
+          
+      - name: Create binary package (cpack)
         working-directory: ./build
         run: |
           cpack
-      - name: "Archive binary package (github artifacts)"
-        uses: actions/upload-artifact@v2
+          
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
         with:
-          name: "switch-gl3"
+          name: "switch-gl3-package"
           path: build/*.zip
           if-no-files-found: error
+          retention-days: 7