diff --git a/_constraints b/_constraints
index 5dc7766..82a9623 100644
--- a/_constraints
+++ b/_constraints
@@ -1,7 +1,27 @@
 <constraints>
   <hardware>
     <disk>
-      <size unit="G">12</size>
+      <size unit="G">19</size>
     </disk>
   </hardware>
+  <overwrite>
+    <conditions>
+      <arch>i586</arch>
+    </conditions>
+    <hardware>
+      <disk>
+        <size unit="G">16</size>
+      </disk>
+    </hardware>
+  </overwrite>
+  <overwrite>
+    <conditions>
+      <arch>s390x</arch>
+    </conditions>
+    <hardware>
+      <disk>
+        <size unit="G">22</size>
+      </disk>
+    </hardware>
+  </overwrite>
 </constraints>
diff --git a/gstreamer-plugins-rs.changes b/gstreamer-plugins-rs.changes
index c46db59..752970a 100644
--- a/gstreamer-plugins-rs.changes
+++ b/gstreamer-plugins-rs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 18 09:04:54 UTC 2022 - Antonio Larrosa <alarrosa@suse.com>
+
+- Increase the disk constraint since i586 builds take ~15.6 GB,
+  s390x over 22 GB and other archs ~18.8 GB.
+
 -------------------------------------------------------------------
 Mon Jan 17 16:22:51 UTC 2022 - Antonio Larrosa <alarrosa@suse.com>