diff --git a/master/custom/builders.py b/master/custom/builders.py
index 51f6a26a..6f0f0116 100644
--- a/master/custom/builders.py
+++ b/master/custom/builders.py
@@ -129,6 +129,26 @@
     ("PPC64LE CentOS9 LTO", "cstratak-CentOS9-ppc64le", LTONonDebugUnixBuild),
     ("PPC64LE CentOS9 LTO + PGO", "cstratak-CentOS9-ppc64le", LTOPGONonDebugBuild),
 
+    # Fedora Linux aarch64 GCC/Clang
+    ("aarch64 Fedora Stable", "cstratak-fedora-stable-aarch64", FedoraStableBuild),
+    ("aarch64 Fedora Stable Refleaks", "cstratak-fedora-stable-aarch64", UnixRefleakBuild),
+    ("aarch64 Fedora Stable Clang", "cstratak-fedora-stable-aarch64", ClangUnixBuild),
+    ("aarch64 Fedora Stable Clang Installed", "cstratak-fedora-stable-aarch64", ClangUnixInstalledBuild),
+    ("aarch64 Fedora Stable LTO", "cstratak-fedora-stable-aarch64", LTONonDebugUnixBuild),
+    ("aarch64 Fedora Stable LTO + PGO", "cstratak-fedora-stable-aarch64", LTOPGONonDebugBuild),
+
+    # RHEL8 aarch64 GCC
+    ("aarch64 RHEL8", "cstratak-RHEL8-aarch64", RHEL8Build),
+    ("aarch64 RHEL8 Refleaks", "cstratak-RHEL8-aarch64", UnixRefleakBuild),
+    ("aarch64 RHEL8 LTO", "cstratak-RHEL8-aarch64", LTONonDebugUnixBuild),
+    ("aarch64 RHEL8 LTO + PGO", "cstratak-RHEL8-aarch64", LTOPGONonDebugBuild),
+
+    # CentOS Stream 9 Linux aarch64 GCC
+    ("aarch64 CentOS9", "cstratak-CentOS9-aarch64", CentOS9Build),
+    ("aarch64 CentOS9 Refleaks", "cstratak-CentOS9-aarch64", UnixRefleakBuild),
+    ("aarch64 CentOS9 LTO", "cstratak-CentOS9-aarch64", LTONonDebugUnixBuild),
+    ("aarch64 CentOS9 LTO + PGO", "cstratak-CentOS9-aarch64", LTOPGONonDebugBuild),
+
     # macOS aarch64 clang
     ("ARM64 macOS", "pablogsal-macos-m1", MacOSArmWithBrewBuild),
     ("ARM64 MacOS M1 NoGIL", "itamaro-macos-arm64-aws", MacOSArmWithBrewNoGilBuild),
@@ -267,27 +287,6 @@
     ("aarch64 Fedora Rawhide LTO", "cstratak-fedora-rawhide-aarch64", LTONonDebugUnixBuild),
     ("aarch64 Fedora Rawhide LTO + PGO", "cstratak-fedora-rawhide-aarch64", LTOPGONonDebugBuild),
 
-    # Fedora Linux aarch64 GCC/clang
-    # (marked unstable for a hardware migration)
-    ("aarch64 Fedora Stable", "cstratak-fedora-stable-aarch64", FedoraStableBuild),
-    ("aarch64 Fedora Stable Refleaks", "cstratak-fedora-stable-aarch64", UnixRefleakBuild),
-    ("aarch64 Fedora Stable Clang", "cstratak-fedora-stable-aarch64", ClangUnixBuild),
-    ("aarch64 Fedora Stable Clang Installed", "cstratak-fedora-stable-aarch64", ClangUnixInstalledBuild),
-    ("aarch64 Fedora Stable LTO", "cstratak-fedora-stable-aarch64", LTONonDebugUnixBuild),
-    ("aarch64 Fedora Stable LTO + PGO", "cstratak-fedora-stable-aarch64", LTOPGONonDebugBuild),
-
-    # RHEL8 aarch64 GCC
-    # (marked unstable for a hardware migration)
-    ("aarch64 RHEL8", "cstratak-RHEL8-aarch64", RHEL8Build),
-    ("aarch64 RHEL8 Refleaks", "cstratak-RHEL8-aarch64", UnixRefleakBuild),
-    ("aarch64 RHEL8 LTO", "cstratak-RHEL8-aarch64", LTONonDebugUnixBuild),
-    ("aarch64 RHEL8 LTO + PGO", "cstratak-RHEL8-aarch64", LTOPGONonDebugBuild),
-
-    # CentOS Stream 9 Linux aarch64 GCC
-    ("aarch64 CentOS9 Refleaks", "cstratak-CentOS9-aarch64", UnixRefleakBuild),
-    ("aarch64 CentOS9 LTO", "cstratak-CentOS9-aarch64", LTONonDebugUnixBuild),
-    ("aarch64 CentOS9 LTO + PGO", "cstratak-CentOS9-aarch64", LTOPGONonDebugBuild),
-
     # CentOS Stream 10 Linux aarch64 GCC/Clang
     ("aarch64 CentOS10", "cstratak-CentOS10-aarch64", CentOS10Build),
     ("aarch64 CentOS10 Refleaks", "cstratak-CentOS10-aarch64", UnixRefleakBuild),
diff --git a/master/custom/workers.py b/master/custom/workers.py
index 11223835..bf960055 100644
--- a/master/custom/workers.py
+++ b/master/custom/workers.py
@@ -149,23 +149,23 @@ def get_workers(settings):
         cpw(
             name="cstratak-fedora-rawhide-aarch64",
             tags=['linux', 'unix', 'fedora', 'arm', 'arm64', 'aarch64'],
-            parallel_tests=40,
+            parallel_tests=32,
         ),
         cpw(
             name="cstratak-fedora-stable-aarch64",
             tags=['linux', 'unix', 'fedora', 'arm', 'arm64', 'aarch64'],
-            parallel_tests=40,
+            parallel_tests=32,
         ),
         cpw(
             name="cstratak-RHEL8-aarch64",
             tags=['linux', 'unix', 'rhel', 'arm', 'arm64', 'aarch64'],
-            parallel_tests=40,
+            parallel_tests=32,
             branches=['3.10', '3.11', '3.12'],
         ),
         cpw(
             name="cstratak-CentOS9-aarch64",
             tags=['linux', 'unix', 'rhel', 'arm', 'arm64', 'aarch64'],
-            parallel_tests=40,
+            parallel_tests=32,
         ),
         cpw(
             name="cstratak-CentOS10-aarch64",