diff --git a/roles/mbs/common/templates/config.py b/roles/mbs/common/templates/config.py
index 950c96a017..f4f811b8fb 100644
--- a/roles/mbs/common/templates/config.py
+++ b/roles/mbs/common/templates/config.py
@@ -165,9 +165,13 @@ class ProdConfiguration(BaseConfiguration):
 
 {% else %}
     KOJI_PROFILE = 'production'
-    ARCHES = ['aarch64', 'armv7hl', 'i686', 'ppc64le', 'x86_64', 's390x']
+    ARCHES = ['aarch64', 'i686', 'ppc64le', 'x86_64', 's390x']
     BASE_MODULE_ARCHES = {
-        'platform:f31': ['aarch64', 'armv7hl', 'ppc64le', 'x86_64', 's390x'],
+        # Fedora >= 37 removes armv7hl, Fedora < 37 still have it
+        # https://fedoraproject.org/wiki/Changes/RetireARMv7
+        'platform:f34': ['aarch64', 'i686', 'ppc64le', 'x86_64', 's390x']
+        'platform:f35': ['aarch64', 'i686', 'ppc64le', 'x86_64', 's390x']
+        'platform:f36': ['aarch64', 'i686', 'ppc64le', 'x86_64', 's390x']
         'platform:el8' : ['aarch64', 'ppc64le', 'x86_64', 's390x']
     }
     KOJI_REPOSITORY_URL = 'https://kojipkgs.fedoraproject.org/repos'