diff --git a/.github/actions/godot-deps/action.yml b/.github/actions/godot-deps/action.yml
index 38731db5d6b2..943771d22ba3 100644
--- a/.github/actions/godot-deps/action.yml
+++ b/.github/actions/godot-deps/action.yml
@@ -11,8 +11,8 @@ runs:
   using: "composite"
   steps:
     # Use python 3.x release (works cross platform)
-    - name: Set up Python 3.x
-      uses: actions/setup-python@v4
+    - name: Set up Python ${{ inputs.python-version }}
+      uses: actions/setup-python@v5
       with:
         # Semantic version range syntax or exact version of a Python version
         python-version: ${{ inputs.python-version }}
diff --git a/.github/workflows/switch_builds.yml b/.github/workflows/switch_builds.yml
index 5353e7226fb0..1f0c2835499a 100644
--- a/.github/workflows/switch_builds.yml
+++ b/.github/workflows/switch_builds.yml
@@ -5,11 +5,12 @@ on:
 # Global Cache Settings
 env:
   GODOT_BASE_BRANCH: 3.5
+  SCONSFLAGS: verbose=yes warnings=all werror=no debug_symbols=no
   SCONS_CACHE_LIMIT: 4096
 
 jobs:
   switch-template:
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-20.04"
     container: devkitpro/devkita64
 
     name: Template (target=release, tools=no)
@@ -17,32 +18,22 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # Upload cache on completion and check it out now
-      - name: Load .scons_cache directory
-        id: switch-template-cache
-        uses: actions/cache@v2
+      - name: Setup Godot build cache
+        uses: ./.github/actions/godot-cache
         with:
-          path: ${{github.workspace}}/.scons_cache/
-          key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-          restore-keys: |
-            ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-            ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-            ${{github.job}}-${{env.GODOT_BASE_BRANCH}}
-
-      - name: Install scons from pip
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install python3-pip
-          sudo python3 -m pip install scons
+          cache-name: switch-template
+        continue-on-error: true
 
-      - name: Compilation
-        env:
-          SCONS_CACHE: ${{github.workspace}}/.scons_cache/
-        run: |
-          scons -j2 verbose=yes warnings=all werror=no platform=switch target=release tools=no
+      - name: Setup python and scons
+        uses: ./.github/actions/godot-deps
 
-      - uses: actions/upload-artifact@v2
+      - name: Compilation
+        uses: ./.github/actions/godot-build
         with:
-          name: ${{ github.job }}
-          path: bin/*
-          retention-days: 14
+          sconsflags: ${{ env.SCONSFLAGS }}
+          platform: switch
+          target: release
+          tools: false
+
+      - name: Upload artifact
+        uses: ./.github/actions/upload-artifact
diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index 8f3f7ea500cf..9e50d6f6c0d0 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -6,8 +6,6 @@ on:
 env:
   GODOT_BASE_BRANCH: 3.5
   SCONSFLAGS: verbose=yes warnings=all werror=no debug_symbols=no
-  VITASDK: /usr/local/vitasdk
-  EUID: 1 makepkg
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-vita
@@ -16,37 +14,30 @@ concurrency:
 jobs:
   vita-template:
     runs-on: "ubuntu-20.04"
+    container: halotroop2288/vitasdk-ubuntu
+
     name: Template (target=release, tools=no)
 
     steps:
       - uses: actions/checkout@v2
 
-      # Azure repositories are not reliable, we need to prevent azure giving us packages.
-      - name: Make apt sources.list use the default Ubuntu repositories
-        run: |
-          sudo rm -f /etc/apt/sources.list.d/*
-          sudo cp -f misc/ci/sources.list /etc/apt/sources.list
-          sudo apt-get update
       - name: Setup Godot build cache
         uses: ./.github/actions/godot-cache
+        with:
+          cache-name: vita-template
         continue-on-error: true
 
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
 
-      - name: Setup VitaSDK
+      - name: Setup PVR_PSP2
         run: |
-          sudo apt-get install cmake libarchive-tools fakeroot zip -y
-          git clone https://github.com/vitasdk/vdpm
+          su user
           git clone https://github.com/isage/vita-packages-extra
-          cd vdpm
-          ./bootstrap-vitasdk.sh
-          ./install-all.sh
-          export PATH=$VITASDK/bin:$PATH
-          vdpm vita-rss-libdl
-          cd ../vita-packages-extra/pvr_psp2
+          cd vita-packages-extra/pvr_psp2
           vita-makepkg
           vdpm *-arm.tar.xz
+
       - name: Compilation
         uses: ./.github/actions/godot-build
         with: