diff --git a/_constraints b/_constraints
index 9632274..c74b3ec 100644
--- a/_constraints
+++ b/_constraints
@@ -1,25 +1,50 @@
 <?xml version="1.0"?>
 <constraints>
   <hardware>
-  <processors>8</processors>
-    <physicalmemory>
+  <processors>4</processors>
+    <memory>
       <size unit="G">8</size>
-    </physicalmemory>
+    </memory>
     <disk>
       <size unit="G">20</size>
     </disk>
   </hardware>
   <overwrite>
     <conditions>
+      <arch>i586</arch>
       <arch>armv6l</arch>
       <arch>armv7l</arch>
-      <arch>i586</arch>
     </conditions>
     <hardware>
-<!-- Less CPU means less codegen units, and less memory use, but longer compile times -->
       <processors>2</processors>
+      <physicalmemory>
+        <size unit="G">4</size>
+      </physicalmemory>
       <disk>
-        <size unit="G">30</size>
+        <size unit="G">15</size>
+      </disk>
+    </hardware>
+  </overwrite>
+  <overwrite>
+    <conditions>
+      <arch>x86_64</arch>
+    </conditions>
+    <hardware>
+      <physicalmemory>
+        <size unit="G">8</size>
+      </physicalmemory>
+    </hardware>
+  </overwrite>
+  <overwrite>
+    <conditions>
+      <arch>aarch64</arch>
+    </conditions>
+    <hardware>
+      <physicalmemory>
+        <size unit="G">8</size>
+      </physicalmemory>
+      <disk>
+        <size unit="G">10</size>
       </disk>
     </hardware>
   </overwrite>