diff --git a/_constraints b/_constraints
index 9016c03..d4a07cc 100644
--- a/_constraints
+++ b/_constraints
@@ -1,8 +1,5 @@
 <constraints>
   <hardware>
-    <disk>
-      <size unit="G">4</size>
-    </disk>
     <physicalmemory>
       <size unit="M">8000</size>
     </physicalmemory>
@@ -11,6 +8,7 @@
     <conditions>
       <arch>armv6l</arch>
       <arch>armv7l</arch>
+      <arch>aarch64</arch>
     </conditions>
      <hardware>
      <physicalmemory>
@@ -28,5 +26,15 @@
      </physicalmemory>
     </hardware>
   </overwrite>
+  <overwrite>
+    <conditions>
+      <arch>s390x</arch>
+    </conditions>
+     <hardware>
+     <physicalmemory>
+        <size unit="M">2000</size>
+     </physicalmemory>
+    </hardware>
+  </overwrite>
 </constraints> 
 
diff --git a/colord.changes b/colord.changes
index a153209..1a5fac4 100644
--- a/colord.changes
+++ b/colord.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May  5 09:06:57 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
+
+- Tune _constraints for various architectures.
+
 -------------------------------------------------------------------
 Fri Sep 16 15:20:32 UTC 2022 - Michael Gorse <mgorse@suse.com>
 
diff --git a/colord.spec b/colord.spec
index 154c118..b6ff112 100644
--- a/colord.spec
+++ b/colord.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package colord
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed