diff --git a/mock/c7-devtoolset-6.aarch64.cfg b/mock/c7-devtoolset-6.aarch64.cfg
index 9a2c129..723591b 100644
--- a/mock/c7-devtoolset-6.aarch64.cfg
+++ b/mock/c7-devtoolset-6.aarch64.cfg
@@ -45,6 +45,11 @@ name=c7.1708.00.aarch64
 baseurl=http://repohost/repo/c7.1708.00.aarch64/
 gpgcheck=0
 
+[c7.1804.u.aarch64]
+name=c7.1804.u.aarch64
+baseurl=http://repohost/repo/c7.1804.u.aarch64/
+gpgcheck=0
+
 [c7.1804.00.aarch64]
 name=c7.1804.00.aarch64
 baseurl=http://repohost/repo/c7.1804.00.aarch64/
diff --git a/mock/c7-devtoolset-6.i386.cfg b/mock/c7-devtoolset-6.i386.cfg
index b101b3d..7dfdae3 100644
--- a/mock/c7-devtoolset-6.i386.cfg
+++ b/mock/c7-devtoolset-6.i386.cfg
@@ -107,6 +107,11 @@ name=c7.1708.00
 enabled=1
 baseurl=http://repohost/repo/c7.1708.00/
 
+[c7.1804.u.i386]
+name=c7.1804.u.i386
+enabled=1
+baseurl=http://repohost/repo/c7.1804.u.i386/
+
 [c7.1804.00.i386]
 name=c7.1804.00.i386
 enabled=1
diff --git a/mock/c7-devtoolset-6.ppc.cfg b/mock/c7-devtoolset-6.ppc.cfg
index 4d7871f..8f3067c 100644
--- a/mock/c7-devtoolset-6.ppc.cfg
+++ b/mock/c7-devtoolset-6.ppc.cfg
@@ -45,6 +45,11 @@ name=c7.1708.00.ppc
 baseurl=http://repohost/repo/c7.1708.00.ppc/
 gpgcheck=0
 
+[c7.1804.u.ppc]
+name=c7.1804.u.ppc
+baseurl=http://repohost/repo/c7.1804.u.ppc/
+gpgcheck=0
+
 [c7.1804.00.ppc]
 name=c7.1804.00.ppc
 baseurl=http://repohost/repo/c7.1804.00.ppc/
diff --git a/mock/c7-devtoolset-6.ppc64.cfg b/mock/c7-devtoolset-6.ppc64.cfg
index 4ba0b45..b0cc714 100644
--- a/mock/c7-devtoolset-6.ppc64.cfg
+++ b/mock/c7-devtoolset-6.ppc64.cfg
@@ -45,6 +45,11 @@ name=c7.1708.00.ppc64
 baseurl=http://repohost/repo/c7.1708.00.ppc64/
 gpgcheck=0
 
+[c7.1804.u.ppc64]
+name=c7.1804.u.ppc64
+baseurl=http://repohost/repo/c7.1804.u.ppc64/
+gpgcheck=0
+
 [c7.1804.00.ppc64]
 name=c7.1804.00.ppc64
 baseurl=http://repohost/repo/c7.1804.00.ppc64/
diff --git a/mock/c7-devtoolset-6.ppc64le.cfg b/mock/c7-devtoolset-6.ppc64le.cfg
index b538ac1..9fb5d0b 100644
--- a/mock/c7-devtoolset-6.ppc64le.cfg
+++ b/mock/c7-devtoolset-6.ppc64le.cfg
@@ -45,6 +45,11 @@ name=c7.1708.00.ppc64le
 baseurl=http://repohost/repo/c7.1708.00.ppc64le/
 gpgcheck=0
 
+[c7.1804.u.ppc64le]
+name=c7.1804.u.ppc64le
+baseurl=http://repohost/repo/c7.1804.u.ppc64le/
+gpgcheck=0
+
 [c7.1804.00.ppc64le]
 name=c7.1804.00.ppc64le
 baseurl=http://repohost/repo/c7.1804.00.ppc64le/
diff --git a/mock/c7-devtoolset-6.x86_64.cfg b/mock/c7-devtoolset-6.x86_64.cfg
index a126c48..42c9ec4 100644
--- a/mock/c7-devtoolset-6.x86_64.cfg
+++ b/mock/c7-devtoolset-6.x86_64.cfg
@@ -118,6 +118,12 @@ enabled=1
 baseurl=http://repohost/repo/c7.1708.00/
 includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
 
+[c7.1804.u.x86_64]
+name=c7.1804.u.x86_64
+enabled=1
+baseurl=http://repohost/repo/c7.1804.u.x86_64/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
 [c7.1804.00.x86_64]
 name=c7.1804.00.x86_64
 enabled=1
diff --git a/mock/c7-extras.a32-armv7hl.cfg b/mock/c7-extras.a32-armv7hl.cfg
deleted file mode 100644
index ca5ca78..0000000
--- a/mock/c7-extras.a32-armv7hl.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-config_opts['root'] = 'c7-extras.a32-armv7hl'
-config_opts['basedir'] = 'MOCKROOT'
-config_opts['target_arch'] = 'armv7hl'
-config_opts['legal_host_arches'] = ('armv7hl',)
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils centos-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
-config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
-
-config_opts['%centos_ver'] = "7"
-config_opts['macros']['%centos_ver'] = "7"
-config_opts['macros']['%rhel'] = "7"
-config_opts['macros']['%centos'] = "7"
-config_opts['macros']['%el7'] = "1"
-config_opts['macros']['%redhat'] = "7"
-config_opts['macros']['%vendor'] = "CentOS"
-config_opts['macros']['%packager'] = "CentOS BuildSystem <http://bugs.centos.org>"
-config_opts['macros']['%_vendor'] = "redhat"
-config_opts['macros']['%_vendor_host'] = "redhat"
-config_opts['macros']['%_host'] = "armv7hl-redhat-linux-gnu"
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-syslog_ident=mock
-syslog_device=
-
-# repos
-[c7.1511.00.a32]
-name=c7.1511.00.a32
-baseurl=http://repohost/tmp/repo/c7.1511.00.a32/
-gpgcheck=0
-cost=2000
-
-[c7.1511.u.a32]
-name=c7.1511.u.a32
-baseurl=http://repohost/tmp/repo/c7.1511.u.a32/
-gpgcheck=0
-cost=1900
-
-[c7-extras.a32]
-name=c7-extras.a32
-baseurl=http://repohost/tmp/repo/c7-extras.a32/
-gpgcheck=0
-cost=500
-
-"""
diff --git a/mock/c7-extras.aarch64.cfg b/mock/c7-extras.aarch64.cfg
index 8f0ce38..a624c60 100644
--- a/mock/c7-extras.aarch64.cfg
+++ b/mock/c7-extras.aarch64.cfg
@@ -45,4 +45,14 @@ name=c7.1708.00.aarch64
 baseurl=http://repohost/repo/c7.1708.00.aarch64/
 gpgcheck=0
 
+[c7.1804.u.aarch64]
+name=c7.1804.u.aarch64
+baseurl=http://repohost/repo/c7.1804.u.aarch64/
+gpgcheck=0
+
+[c7.1804.00.aarch64]
+name=c7.1804.00.aarch64
+baseurl=http://repohost/repo/c7.1804.00.aarch64/
+gpgcheck=0
+
 """
diff --git a/mock/c7-extras.armhfp.cfg b/mock/c7-extras.armhfp.cfg
index 4aa7021..78599bc 100644
--- a/mock/c7-extras.armhfp.cfg
+++ b/mock/c7-extras.armhfp.cfg
@@ -73,6 +73,18 @@ baseurl=http://repohost/repo/c7.1708.u.armhfp/
 enabled=1
 gpgcheck=0
 
+[c7.1804.00.armhfp]
+name=c7.1804.00.armhfp
+baseurl=http://repohost/repo/c7.1804.00.armhfp/
+enabled=1
+gpgcheck=0
+
+[c7.1804.u.armhfp]
+name=c7.1804.u.armhfp
+baseurl=http://repohost/repo/c7.1804.u.armhfp/
+enabled=1
+gpgcheck=0
+
 [c7-extras.armhfp]
 name=c7-extras.armhfp
 baseurl=http://repohost/repo/c7-extras.armhfp/
diff --git a/mock/c7-extras.i686.cfg b/mock/c7-extras.i686.cfg
index c0c183b..6c48ff2 100644
--- a/mock/c7-extras.i686.cfg
+++ b/mock/c7-extras.i686.cfg
@@ -101,10 +101,19 @@ name=c7.1708.u.i386
 enabled=1
 baseurl=http://repohost/repo/c7.1708.u.i386/
 
-
 [c7.1708.00]
 name=c7.1708.00
 enabled=1
 baseurl=http://repohost/repo/c7.1708.00/
 
+[c7.1804.u.i386]
+name=c7.1804.u.i386
+enabled=1
+baseurl=http://repohost/repo/c7.1804.u.i386/
+
+[c7.1804.00.i386]
+name=c7.1804.00.i386
+enabled=1
+baseurl=http://repohost/repo/c7.1804.00.i386/
+
 """
diff --git a/mock/c7-extras.ppc.cfg b/mock/c7-extras.ppc.cfg
index c445c22..7ac82df 100644
--- a/mock/c7-extras.ppc.cfg
+++ b/mock/c7-extras.ppc.cfg
@@ -44,6 +44,18 @@ baseurl=http://repohost/repo/c7.1708.00.ppc64/
 gpgcheck=0
 cost=1700
 
+[c7.1804.u.ppc]
+name=c7.1804.u.ppc
+baseurl=http://repohost/repo/c7.1804.u.ppc64/
+gpgcheck=0
+cost=1900
+
+[c7.1804.00.ppc]
+name=c7.1804.00.ppc
+baseurl=http://repohost/repo/c7.1804.00.ppc64/
+gpgcheck=0
+cost=1700
+
 [c7-extras.ppc]
 name=c7-extras.ppc
 baseurl=http://repohost/repo/c7-extras.ppc64/
diff --git a/mock/c7-extras.ppc64.cfg b/mock/c7-extras.ppc64.cfg
index 0dd783c..041a8f5 100644
--- a/mock/c7-extras.ppc64.cfg
+++ b/mock/c7-extras.ppc64.cfg
@@ -44,6 +44,18 @@ baseurl=http://repohost/repo/c7.1708.00.ppc64/
 gpgcheck=0
 cost=1700
 
+[c7.1804.u.ppc64]
+name=c7.1804.u.ppc64
+baseurl=http://repohost/repo/c7.1804.u.ppc64/
+gpgcheck=0
+cost=1900
+
+[c7.1804.00.ppc64]
+name=c7.1804.00.ppc64
+baseurl=http://repohost/repo/c7.1804.00.ppc64/
+gpgcheck=0
+cost=1700
+
 [c7-extras.ppc64]
 name=c7-extras.ppc64
 baseurl=http://repohost/repo/c7-extras.ppc64/
diff --git a/mock/c7-extras.ppc64le.cfg b/mock/c7-extras.ppc64le.cfg
index 9f0fd89..6f97a6d 100644
--- a/mock/c7-extras.ppc64le.cfg
+++ b/mock/c7-extras.ppc64le.cfg
@@ -44,6 +44,18 @@ baseurl=http://repohost/repo/c7.1708.00.ppc64le/
 gpgcheck=0
 cost=1700
 
+[c7.1804.u.ppc64le]
+name=c7.1804.u.ppc64le
+baseurl=http://repohost/repo/c7.1804.u.ppc64le/
+gpgcheck=0
+cost=1900
+
+[c7.1804.00.ppc64le]
+name=c7.1804.00.ppc64le
+baseurl=http://repohost/repo/c7.1804.00.ppc64le/
+gpgcheck=0
+cost=1700
+
 [c7-extras.ppc64le]
 name=c7-extras.ppc64le
 baseurl=http://repohost/repo/c7-extras.ppc64le/
diff --git a/mock/c7-extras.x86_64.cfg b/mock/c7-extras.x86_64.cfg
index f5354ca..51b9451 100644
--- a/mock/c7-extras.x86_64.cfg
+++ b/mock/c7-extras.x86_64.cfg
@@ -1,6 +1,6 @@
 config_opts['root'] = 'TARGETNAME'
 config_opts['target_arch'] = 'x86_64'
-config_opts['legal_host_arches'] = ('x86_64',)
+config_opts['legal_host_arches'] = ('x86_64','noarch')
 config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
@@ -118,4 +118,15 @@ enabled=1
 baseurl=http://repohost/repo/c7.1708.00/
 includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
 
+[c7.1804.u.x86_64]
+name=c7.1804.u.x86_64
+enabled=1
+baseurl=http://repohost/repo/c7.1804.u.x86_64/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
+
+[c7.1804.00.x86_64]
+name=c7.1804.00.x86_64
+enabled=1
+baseurl=http://repohost/repo/c7.1804.00.x86_64/
+includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686
 """
diff --git a/mock/c7.1708.devtoolset-6.armhfp.cfg b/mock/c7.1708.devtoolset-6.armhfp.cfg
index 0a47dab..146f1ea 100644
--- a/mock/c7.1708.devtoolset-6.armhfp.cfg
+++ b/mock/c7.1708.devtoolset-6.armhfp.cfg
@@ -83,6 +83,12 @@ baseurl=http://repohost/repo/c7.1804.00.armhfp/
 enabled=1
 gpgcheck=0
 
+[c7.1804.u.armhfp]
+name=c7.1804.u.armhfp
+baseurl=http://repohost/repo/c7.1804.u.armhfp/
+enabled=1
+gpgcheck=0
+
 [c7.1708.devtoolset-6.armhfp]
 name=c7.1708.devtoolset-6.armhfp
 baseurl=http://repohost/repo/c7.1708.devtoolset-6.armhfp/
diff --git a/mock/c7.1708.devtoolset-7.armhfp.cfg b/mock/c7.1708.devtoolset-7.armhfp.cfg
index 0e26ec6..d43bf76 100644
--- a/mock/c7.1708.devtoolset-7.armhfp.cfg
+++ b/mock/c7.1708.devtoolset-7.armhfp.cfg
@@ -83,6 +83,12 @@ baseurl=http://repohost/repo/c7.1804.00.armhfp/
 enabled=1
 gpgcheck=0
 
+[c7.1804.u.armhfp]
+name=c7.1804.u.armhfp
+baseurl=http://repohost/repo/c7.1804.u.armhfp/
+enabled=1
+gpgcheck=0
+
 [c7.1708.devtoolset-7.armhfp]
 name=c7.1708.devtoolset-7.armhfp
 baseurl=http://repohost/repo/c7.1708.devtoolset-7.armhfp/