diff --git a/etc/mock/rl-9-aarch64-secureboot.cfg b/etc/mock/rl-9-aarch64-core-infra.cfg
similarity index 96%
rename from etc/mock/rl-9-aarch64-secureboot.cfg
rename to etc/mock/rl-9-aarch64-core-infra.cfg
index ff853f2..f6f56df 100644
--- a/etc/mock/rl-9-aarch64-secureboot.cfg
+++ b/etc/mock/rl-9-aarch64-core-infra.cfg
@@ -2,7 +2,7 @@ include('templates/rl-9-pub.tpl')
 include('templates/rl-9-sig-core.tpl')
 include('templates/rl-9-scopes.tpl')
 
-config_opts['root'] = 'rl-9-aarch64-secureboot'
+config_opts['root'] = 'rl-9-aarch64-core-infra'
 config_opts['target_arch'] = 'aarch64'
 config_opts['legal_host_arches'] = ('aarch64',)
 config_opts['releasever'] = '9'
diff --git a/etc/mock/rl-9-ppc64le-core-infra.cfg b/etc/mock/rl-9-ppc64le-core-infra.cfg
new file mode 100644
index 0000000..b2870d9
--- /dev/null
+++ b/etc/mock/rl-9-ppc64le-core-infra.cfg
@@ -0,0 +1,27 @@
+include('templates/rl-9-pub.tpl')
+include('templates/rl-9-sig-core.tpl')
+include('templates/rl-9-scopes.tpl')
+
+config_opts['root'] = 'rl-9-ppc64le-core-infra'
+config_opts['target_arch'] = 'ppc64le'
+config_opts['legal_host_arches'] = ('ppc64le',)
+config_opts['releasever'] = '9'
+config_opts['description'] = 'Rocky Linux 9'
+config_opts['use_bootstrap_image'] = False
+config_opts['rpmbuild_command'] = '/usr/bin/rpmbuild'
+config_opts['package_manager'] = 'dnf'
+config_opts['dist'] = 'el9'
+
+# Applicable Macros
+config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
+config_opts['macros']['%_host'] = 'ppc64le-redhat-linux-gnu'
+config_opts['macros']['%_host_cpu'] = 'ppc64le'
+config_opts['macros']['%_vendor'] = "redhat"
+config_opts['macros']['%_vendor_host'] = "redhat"
+# These are typically set from rocky-release and may not have an effect
+config_opts['macros']['%__bootstrap'] = '~bootstrap'
+config_opts['macros']['%distribution'] = 'Rocky Linux 9'
+config_opts['macros']['%dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el9%{?with_bootstrap:~bootstrap}'
+config_opts['macros']['%rhel'] = '9'
+
+# To set specialty macros, such as %vendor, please run 'rocky-mock-macros-setup'
diff --git a/etc/mock/rl-9-s390x-core-infra.cfg b/etc/mock/rl-9-s390x-core-infra.cfg
new file mode 100644
index 0000000..26fc712
--- /dev/null
+++ b/etc/mock/rl-9-s390x-core-infra.cfg
@@ -0,0 +1,27 @@
+include('templates/rl-9-pub.tpl')
+include('templates/rl-9-sig-core.tpl')
+include('templates/rl-9-scopes.tpl')
+
+config_opts['root'] = 'rl-9-s390x-core-infra'
+config_opts['target_arch'] = 's390x'
+config_opts['legal_host_arches'] = ('s390x',)
+config_opts['releasever'] = '9'
+config_opts['description'] = 'Rocky Linux 9'
+config_opts['use_bootstrap_image'] = False
+config_opts['rpmbuild_command'] = '/usr/bin/rpmbuild'
+config_opts['package_manager'] = 'dnf'
+config_opts['dist'] = 'el9'
+
+# Applicable Macros
+config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
+config_opts['macros']['%_host'] = 's390x-redhat-linux-gnu'
+config_opts['macros']['%_host_cpu'] = 's390x'
+config_opts['macros']['%_vendor'] = "redhat"
+config_opts['macros']['%_vendor_host'] = "redhat"
+# These are typically set from rocky-release and may not have an effect
+config_opts['macros']['%__bootstrap'] = '~bootstrap'
+config_opts['macros']['%distribution'] = 'Rocky Linux 9'
+config_opts['macros']['%dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el9%{?with_bootstrap:~bootstrap}'
+config_opts['macros']['%rhel'] = '9'
+
+# To set specialty macros, such as %vendor, please run 'rocky-mock-macros-setup'
diff --git a/etc/mock/rl-9-x86_64-secureboot.cfg b/etc/mock/rl-9-x86_64-core-infra.cfg
similarity index 96%
rename from etc/mock/rl-9-x86_64-secureboot.cfg
rename to etc/mock/rl-9-x86_64-core-infra.cfg
index 2efcb6e..ea051fb 100644
--- a/etc/mock/rl-9-x86_64-secureboot.cfg
+++ b/etc/mock/rl-9-x86_64-core-infra.cfg
@@ -2,7 +2,7 @@ include('templates/rl-9-pub.tpl')
 include('templates/rl-9-sig-core.tpl')
 include('templates/rl-9-scopes.tpl')
 
-config_opts['root'] = 'rl-9-x86_64-secureboot'
+config_opts['root'] = 'rl-9-x86_64-core-infra'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)
 config_opts['releasever'] = '9'