diff --git a/master/custom/builders.py b/master/custom/builders.py
index 2ab8eb26..e2492657 100644
--- a/master/custom/builders.py
+++ b/master/custom/builders.py
@@ -159,7 +159,10 @@
 
     # Linux armv7l (32-bit) GCC
     ("ARM Raspbian", "gps-raspbian", SlowNonDebugUnixBuild),
+
+    # Linux armv8 (64-bit) GCC
     ("ARM64 Raspbian", "stan-raspbian", SlowNonDebugUnixBuild),
+    ("ARM64 Raspbian Debug", "savannah-raspbian", SlowDebugUnixBuild),
 
     # FreBSD x86-64 clang
     ("AMD64 FreeBSD", "ware-freebsd", UnixBuild),
@@ -312,9 +315,6 @@
 
     # Emscripten
     ("WASM Emscripten", "rkm-emscripten", EmscriptenBuild),
-
-    # Linux aarch64 GCC/Clang
-    ("ARM64 Raspbian Debug", "savannah-raspbian", SlowDebugUnixBuild),
 ]