diff --git a/scripts/build_switch.sh b/scripts/build_switch.sh
index bccc3642f..1a7425d4e 100755
--- a/scripts/build_switch.sh
+++ b/scripts/build_switch.sh
@@ -14,6 +14,8 @@ PKGS=(
     "switch-libmpv-0.36.0-3-any.pkg.tar.zst"
     "switch-nspmini-48d4fc2-1-any.pkg.tar.xz"
     "hacBrewPack-3.05-1-any.pkg.tar.zst"
+    # Remove this line after the next devkitpro/devkita64 docker image release
+    "switch-tools-1.13.0-1-x86_64.pkg.tar.zst"
 )
 for PKG in "${PKGS[@]}"; do
     [ -f "${PKG}" ] || curl -LO ${BASE_URL}${PKG}
diff --git a/scripts/build_switch_deko3d.sh b/scripts/build_switch_deko3d.sh
index 222511bd2..687d666dc 100755
--- a/scripts/build_switch_deko3d.sh
+++ b/scripts/build_switch_deko3d.sh
@@ -15,6 +15,8 @@ PKGS=(
     "switch-libmpv_deko3d-0.36.0-2-any.pkg.tar.zst"
     "switch-nspmini-48d4fc2-1-any.pkg.tar.xz"
     "hacBrewPack-3.05-1-any.pkg.tar.zst"
+    # Remove this line after the next devkitpro/devkita64 docker image release
+    "switch-tools-1.13.0-1-x86_64.pkg.tar.zst"
 )
 for PKG in "${PKGS[@]}"; do
     [ -f "${PKG}" ] || curl -LO ${BASE_URL}${PKG}
diff --git a/scripts/switch-forwarder/wiliwili.json b/scripts/switch-forwarder/wiliwili.json
index 032c5a9d1..45b19d4ba 100644
--- a/scripts/switch-forwarder/wiliwili.json
+++ b/scripts/switch-forwarder/wiliwili.json
@@ -242,7 +242,8 @@
     {
       "type": "debug_flags",
       "value": {
-        "allow_debug": true,
+        "allow_debug": false,
+        "force_debug_prod": false,
         "force_debug": true
       }
     },