diff --git a/_constraints b/_constraints
index 885fe51..f54b56d 100644
--- a/_constraints
+++ b/_constraints
@@ -1,29 +1,24 @@
 <constraints>
+  <hardware>
+    <disk>
+      <size unit="G">18</size>
+    </disk>
+    <memory>
+      <size unit="G">8</size>
+    </memory>
+  </hardware>
+    
   <overwrite>
     <conditions>
       <arch>i586</arch>
       <arch>x86_64</arch>
+      <arch>aarch64</arch>
       <arch>ppc64le</arch>
     </conditions>
     <hardware>
       <physicalmemory>
         <size unit="G">10</size>
       </physicalmemory>
-      <memory>
-        <size unit="G">10</size>
-      </memory>
-    </hardware>
-  </overwrite>
-
-  <overwrite>
-    <conditions/>
-    <hardware>
-      <disk>
-        <size unit="G">18</size>
-      </disk>
-      <memory>
-        <size unit="G">8</size>
-      </memory>
     </hardware>
   </overwrite>
 </constraints>
diff --git a/mariadb.changes b/mariadb.changes
index c590d4e..a3b666f 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun  9 14:38:20 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update _constraints to make it more readable and request
+  more memory for aarch64 to avoid occasionnal OOM errors on %check
+
 -------------------------------------------------------------------
 Wed Jun  3 13:32:46 UTC 2020 - pgajdos@suse.com