diff --git a/.dockerignore b/.dockerignore
index 2f5132ab0..489914680 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -45,7 +45,7 @@ syncthing/pkg/sumdb/
 ext/
 
 # files generated by the debug scripts
-debug_scripts/*.xml
+scripts/debug/*.xml
 
 # Unsupported translations
 app/src/main/play/listings/nb
diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml
index 145f6ae39..b5b7b3828 100644
--- a/.github/workflows/build-app.yaml
+++ b/.github/workflows/build-app.yaml
@@ -50,7 +50,7 @@ jobs:
             echo "Using TRUSTED debug.keystore for builds from branches corresponding to this repository"
             echo '${{ secrets.DEBUG_KEYSTORE_B64 }}' | base64 -d > "/root/.android/debug.keystore"
           else
-            cp "debug_scripts/debug.keystore.pub" "/root/.android/debug.keystore"
+            cp "scripts/debug/debug.keystore.pub" "/root/.android/debug.keystore"
             echo "Using UNTRUSTED PUBLIC debug.keystore for builds from forked repositories"
           fi
 
diff --git a/.gitignore b/.gitignore
index 2f5132ab0..489914680 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,7 @@ syncthing/pkg/sumdb/
 ext/
 
 # files generated by the debug scripts
-debug_scripts/*.xml
+scripts/debug/*.xml
 
 # Unsupported translations
 app/src/main/play/listings/nb
diff --git a/debug_scripts/adb_delete_config_xml.cmd b/scripts/debug/adb_delete_config_xml.cmd
similarity index 100%
rename from debug_scripts/adb_delete_config_xml.cmd
rename to scripts/debug/adb_delete_config_xml.cmd
diff --git a/debug_scripts/adb_forward_webui.cmd b/scripts/debug/adb_forward_webui.cmd
similarity index 100%
rename from debug_scripts/adb_forward_webui.cmd
rename to scripts/debug/adb_forward_webui.cmd
diff --git a/debug_scripts/adb_pull_config_xml.cmd b/scripts/debug/adb_pull_config_xml.cmd
similarity index 100%
rename from debug_scripts/adb_pull_config_xml.cmd
rename to scripts/debug/adb_pull_config_xml.cmd
diff --git a/debug_scripts/adb_pull_config_xml_findstr.cmd b/scripts/debug/adb_pull_config_xml_findstr.cmd
similarity index 100%
rename from debug_scripts/adb_pull_config_xml_findstr.cmd
rename to scripts/debug/adb_pull_config_xml_findstr.cmd
diff --git a/debug_scripts/adb_pull_syncthing_log.cmd b/scripts/debug/adb_pull_syncthing_log.cmd
similarity index 100%
rename from debug_scripts/adb_pull_syncthing_log.cmd
rename to scripts/debug/adb_pull_syncthing_log.cmd
diff --git a/debug_scripts/adb_push_config_xml.cmd b/scripts/debug/adb_push_config_xml.cmd
similarity index 100%
rename from debug_scripts/adb_push_config_xml.cmd
rename to scripts/debug/adb_push_config_xml.cmd
diff --git a/debug_scripts/debug.keystore.pub b/scripts/debug/debug.keystore.pub
similarity index 100%
rename from debug_scripts/debug.keystore.pub
rename to scripts/debug/debug.keystore.pub
diff --git a/debug_scripts/get_rest_system_status.ps1 b/scripts/debug/get_rest_system_status.ps1
similarity index 100%
rename from debug_scripts/get_rest_system_status.ps1
rename to scripts/debug/get_rest_system_status.ps1
diff --git a/debug_scripts/start_test_cluster.cmd b/scripts/debug/start_test_cluster.cmd
similarity index 100%
rename from debug_scripts/start_test_cluster.cmd
rename to scripts/debug/start_test_cluster.cmd