diff --git a/inventory/group_vars/copr_aws b/inventory/group_vars/copr_aws
index 440a27e700..fe9dd9718a 100644
--- a/inventory/group_vars/copr_aws
+++ b/inventory/group_vars/copr_aws
@@ -38,6 +38,8 @@ builders:
     x86_64: [20, 4, 20]
   x86_hypervisor_04:
     x86_64: [20, 4, 20]
+  ibm_cloud_tokyo:
+    s390x: [12, 4, 4]
 copr_aws_region: us-east-1
 # don't forget to update ip in ./copr-keygen, due to custom firewall rules
 
diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws
index 76a0b468f0..8e0a7e5b8a 100644
--- a/inventory/group_vars/copr_dev_aws
+++ b/inventory/group_vars/copr_dev_aws
@@ -37,6 +37,8 @@ builders:
     x86_64: [2, 1, 1]
   x86_hypervisor_04:
     x86_64: [2, 1, 1]
+  ibm_cloud_tokyo:
+    s390x: [2, 1, 1]
 copr_aws_region: us-east-1
 # don't forget to update ip in ./copr-keygen-stg, due to custom firewall rules
 
diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml
index 26f9106258..cc96d76db5 100644
--- a/roles/copr/backend/files/provision/provision_builder_tasks.yml
+++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml
@@ -99,7 +99,6 @@
   when:
     - prepare_base_image is not defined
     - copr_red_hat_subscription_password is defined
-    - devel
   tags:
     - red_hat_subscription
 
@@ -156,7 +155,6 @@
     - s390x
   tags:
   - provision_config
-  when: devel|bool
 
 - name: put copr-rpmbuild configuration file in the right place
   copy: src=files/main.ini dest=/etc/copr-rpmbuild/main.ini
diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml
index 4e0311cbba..ed095319a7 100644
--- a/roles/copr/backend/tasks/main.yml
+++ b/roles/copr/backend/tasks/main.yml
@@ -196,6 +196,7 @@
     - aarch64
     - ppc64le
     - x86_64
+    - s390x
   tags:
   - provision_config
 
diff --git a/roles/copr/backend/templates/copr-be.conf.j2 b/roles/copr/backend/templates/copr-be.conf.j2
index 4af87ab87d..cb2a47ade0 100644
--- a/roles/copr/backend/templates/copr-be.conf.j2
+++ b/roles/copr/backend/templates/copr-be.conf.j2
@@ -47,6 +47,7 @@ builds_max_workers={{ max_workers }}
 builds_max_workers_arch=
     x86_64={{ max_x86_64_workers }},
     aarch64={{ max_aarch64_workers }},
+    s390x={{ max_s390x_workers }},
     armhfp={{ (max_x86_64_workers|int / 4)|int }},
     s390x={{ (max_x86_64_workers|int / 4)|int }},
     i386={{ (max_x86_64_workers|int / 4)|int }},
diff --git a/roles/copr/backend/templates/resalloc/pools.yaml b/roles/copr/backend/templates/resalloc/pools.yaml
index 64a2074258..9768b2a339 100644
--- a/roles/copr/backend/templates/resalloc/pools.yaml
+++ b/roles/copr/backend/templates/resalloc/pools.yaml
@@ -20,12 +20,6 @@ aws_x86_64_{% if spot %}spot{% else %}normal{% endif %}_{% if devel %}dev{% else
     - arch_i686_native
     - arch_armhfp
     - arch_armhfp_emulated
-{% if devel %}
-    - drop_this_warning_warning
-{% else %}
-    - arch_s390x
-    - arch_s390x_emulated
-{% endif %}
     - arch_noarch
     - aws
 {% if spot %}
@@ -86,12 +80,6 @@ copr_hv_x86_64_{{ hv }}_{% if devel %}dev{% else %}prod{% endif %}:
     - arch_i686_native
     - arch_armhfp
     - arch_armhfp_emulated
-{% if devel %}
-    - drop_this_warning_warning
-{% else %}
-    - arch_s390x
-    - arch_s390x_emulated
-{% endif %}
     - hypervisor
     - hypervisor_x86_64
     - hypervisor_x86_64_{{ hv }}
@@ -140,11 +128,16 @@ copr_hv_ppc64le_{{ hv }}_{% if devel %}dev{% else %}prod{% endif %}:
 {% endfor %}
 
 # Z Cloud instances
-{% if devel %}
 copr_ibm_cloud_s390x_tokyo_{% if devel %}dev{% else %}prod{% endif %}:
-  max: 4
-  max_prealloc: 2
-  max_starting: 2
+{% if devel %}
+  max: {{ builders["ibm_cloud_tokyo"][0] }}
+  max_prealloc: {{ builders["ibm_cloud_tokyo"][1] }}
+  max_starting: {{ builders["ibm_cloud_tokyo"][2] }}
+{% else %}
+  max: 2
+  max_prealloc: 1
+  max_starting: 1
+{% endif %}
   tags:
     - copr_builder
     - name: arch_noarch
@@ -161,7 +154,6 @@ copr_ibm_cloud_s390x_tokyo_{% if devel %}dev{% else %}prod{% endif %}:
   reuse_opportunity_time: 180
   reuse_max_count: 8
   reuse_max_time: 1800
-{% endif %}
 
 {% if devel %}
 # Power9 VMs in openpower-controller.osuosl.org