diff --git a/mock-core-configs/etc/mock/templates/opensuse-leap-15.4.tpl b/mock-core-configs/etc/mock/templates/opensuse-leap-15.4.tpl
index 38da567a7..c8b7cfe58 100644
--- a/mock-core-configs/etc/mock/templates/opensuse-leap-15.4.tpl
+++ b/mock-core-configs/etc/mock/templates/opensuse-leap-15.4.tpl
@@ -30,15 +30,15 @@ syslog_device=
 install_weak_deps=0
 metadata_expire=0
 best=1
-{% if target_arch == 'x86_64' %}
+{% if repo_arch == 'x86_64' %}
 excludepkgs=*.i586,*.i686,*.ppc,*.ppc64,*.ppc64le,*.s390x
-{% elif target_arch == 'i586' %}
+{% elif repo_arch == 'i586' %}
 excludepkgs=*.x86_64,*.ppc,*.ppc64,*.ppc64le,*.s390x
-{% elif target_arch == 'ppc64le' %}
+{% elif repo_arch == 'ppc64le' %}
 excludepkgs=*.ppc,*.ppc64,*.x86_64,*.i586,*.i686,*.s390x
-{% elif target_arch == 'ppc64' %}
+{% elif repo_arch == 'ppc64' %}
 excludepkgs=*.ppc,*.ppc64le,*.x86_64,*.i586,*.i686,*.s390x
-{% elif target_arch == 's390x' %}
+{% elif repo_arch == 's390x' %}
 excludepkgs=*.ppc,*.ppc64,*.ppc64le,*.x86_64,*.i586,*.i686
 {% endif %}
 
@@ -48,7 +48,7 @@ user_agent={{ user_agent }}
 # repos
 
 [opensuse-leap-oss]
-name=openSUSE Leap $releasever - {{ target_arch }} - OSS
+name=openSUSE Leap $releasever - {{ repo_arch }} - OSS
 baseurl=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/
 #metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink
 enabled=1
@@ -58,7 +58,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
 gpgcheck=1
 
 [opensuse-leap-oss-update]
-name=openSUSE Leap $releasever - {{ target_arch }} - OSS - Updates
+name=openSUSE Leap $releasever - {{ repo_arch }} - OSS - Updates
 baseurl=https://download.opensuse.org/update/leap/$releasever/oss/
 #metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink
 enabled=1
@@ -66,7 +66,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE
 gpgcheck=1
 
 [opensuse-leap-sle-update]
-name=openSUSE Leap $releasever - {{ target_arch }} - Updates from SUSE Linux Enterprise
+name=openSUSE Leap $releasever - {{ repo_arch }} - Updates from SUSE Linux Enterprise
 baseurl=https://download.opensuse.org/update/leap/$releasever/sle/
 #metalink=https://download.opensuse.org/update/leap/$releasever/sle/repodata/repomd.xml.metalink
 enabled=1
@@ -74,7 +74,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/suse/RPM-GPG-KEY-SuSE-SLE-15
 gpgcheck=1
 
 [opensuse-leap-sle-backports-update]
-name=openSUSE Leap $releasever - {{ target_arch }} - Updates from Backports for SUSE Linux Enterprise
+name=openSUSE Leap $releasever - {{ repo_arch }} - Updates from Backports for SUSE Linux Enterprise
 baseurl=https://download.opensuse.org/update/leap/$releasever/backports/
 #metalink=https://download.opensuse.org/update/leap/$releasever/backports/repodata/repomd.xml.metalink
 enabled=1
diff --git a/mock-core-configs/etc/mock/templates/opensuse-leap-15.5.tpl b/mock-core-configs/etc/mock/templates/opensuse-leap-15.5.tpl
index a1a4748c9..40afc1f3f 100644
--- a/mock-core-configs/etc/mock/templates/opensuse-leap-15.5.tpl
+++ b/mock-core-configs/etc/mock/templates/opensuse-leap-15.5.tpl
@@ -30,15 +30,15 @@ syslog_device=
 install_weak_deps=0
 metadata_expire=0
 best=1
-{% if target_arch == 'x86_64' %}
+{% if repo_arch == 'x86_64' %}
 excludepkgs=*.i586,*.i686,*.ppc,*.ppc64,*.ppc64le,*.s390x
-{% elif target_arch == 'i586' %}
+{% elif repo_arch == 'i586' %}
 excludepkgs=*.x86_64,*.ppc,*.ppc64,*.ppc64le,*.s390x
-{% elif target_arch == 'ppc64le' %}
+{% elif repo_arch == 'ppc64le' %}
 excludepkgs=*.ppc,*.ppc64,*.x86_64,*.i586,*.i686,*.s390x
-{% elif target_arch == 'ppc64' %}
+{% elif repo_arch == 'ppc64' %}
 excludepkgs=*.ppc,*.ppc64le,*.x86_64,*.i586,*.i686,*.s390x
-{% elif target_arch == 's390x' %}
+{% elif repo_arch == 's390x' %}
 excludepkgs=*.ppc,*.ppc64,*.ppc64le,*.x86_64,*.i586,*.i686
 {% endif %}
 
@@ -48,7 +48,7 @@ user_agent={{ user_agent }}
 # repos
 
 [opensuse-leap-oss]
-name=openSUSE Leap $releasever - {{ target_arch }} - OSS
+name=openSUSE Leap $releasever - {{ repo_arch }} - OSS
 baseurl=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/
 #metalink=https://download.opensuse.org/distribution/leap/$releasever/repo/oss/repodata/repomd.xml.metalink
 enabled=1
@@ -59,7 +59,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-202
 gpgcheck=1
 
 [opensuse-leap-oss-update]
-name=openSUSE Leap $releasever - {{ target_arch }} - OSS - Updates
+name=openSUSE Leap $releasever - {{ repo_arch }} - OSS - Updates
 baseurl=https://download.opensuse.org/update/leap/$releasever/oss/
 #metalink=https://download.opensuse.org/update/leap/$releasever/oss/repodata/repomd.xml.metalink
 enabled=1
@@ -67,7 +67,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/opensuse/RPM-GPG-KEY-openSUSE-202
 gpgcheck=1
 
 [opensuse-leap-sle-update]
-name=openSUSE Leap $releasever - {{ target_arch }} - Updates from SUSE Linux Enterprise
+name=openSUSE Leap $releasever - {{ repo_arch }} - Updates from SUSE Linux Enterprise
 baseurl=https://download.opensuse.org/update/leap/$releasever/sle/
 #metalink=https://download.opensuse.org/update/leap/$releasever/sle/repodata/repomd.xml.metalink
 enabled=1
@@ -75,7 +75,7 @@ gpgkey=file:///usr/share/distribution-gpg-keys/suse/RPM-GPG-KEY-SuSE-SLE-Main-20
 gpgcheck=1
 
 [opensuse-leap-sle-backports-update]
-name=openSUSE Leap $releasever - {{ target_arch }} - Updates from Backports for SUSE Linux Enterprise
+name=openSUSE Leap $releasever - {{ repo_arch }} - Updates from Backports for SUSE Linux Enterprise
 baseurl=https://download.opensuse.org/update/leap/$releasever/backports/
 #metalink=https://download.opensuse.org/update/leap/$releasever/backports/repodata/repomd.xml.metalink
 enabled=1
diff --git a/mock-core-configs/etc/mock/templates/opensuse-tumbleweed.tpl b/mock-core-configs/etc/mock/templates/opensuse-tumbleweed.tpl
index 30a73d827..779c71d75 100644
--- a/mock-core-configs/etc/mock/templates/opensuse-tumbleweed.tpl
+++ b/mock-core-configs/etc/mock/templates/opensuse-tumbleweed.tpl
@@ -30,13 +30,13 @@ syslog_device=
 install_weak_deps=0
 metadata_expire=0
 best=1
-{% if target_arch == 'x86_64' %}
+{% if repo_arch == 'x86_64' %}
 excludepkgs=*.i586,*.i686
-{% elif target_arch == 'i586' %}
+{% elif repo_arch == 'i586' %}
 excludepkgs=*.x86_64
-{% elif target_arch == 'ppc64le' %}
+{% elif repo_arch == 'ppc64le' %}
 excludepkgs=*.ppc,*.ppc64
-{% elif target_arch == 'ppc64' %}
+{% elif repo_arch == 'ppc64' %}
 excludepkgs=*.ppc,*.ppc64le
 {% endif %}
 
@@ -46,20 +46,20 @@ user_agent={{ user_agent }}
 # repos
 
 [opensuse-tumbleweed-oss]
-name=openSUSE Tumbleweed - {{ target_arch }} - OSS
-{% if target_arch in ['x86_64'] %}
+name=openSUSE Tumbleweed - {{ repo_arch }} - OSS
+{% if repo_arch in ['x86_64'] %}
 baseurl=https://download.opensuse.org/tumbleweed/repo/oss/
 #metalink=https://download.opensuse.org/tumbleweed/repo/oss/repodata/repomd.xml.metalink
-{% elif target_arch in ['ppc64le', 'ppc64'] %}
+{% elif repo_arch in ['ppc64le', 'ppc64'] %}
 baseurl=https://download.opensuse.org/ports/ppc/tumbleweed/repo/oss/
 #metalink=https://download.opensuse.org/ports/ppc/tumbleweed/repo/oss/repodata/repomd.xml.metalink
-{% elif target_arch in ['aarch64'] %}
+{% elif repo_arch in ['aarch64'] %}
 baseurl=https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/
 #metalink=https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml.metalink
-{% elif target_arch in ['i586'] %}
+{% elif repo_arch in ['i586'] %}
 baseurl=https://download.opensuse.org/ports/i586/tumbleweed/repo/oss/
 #metalink=https://download.opensuse.org/ports/i586/tumbleweed/repo/oss/repodata/repomd.xml.metalink
-{% elif target_arch in ['s390x'] %}
+{% elif repo_arch in ['s390x'] %}
 baseurl=https://download.opensuse.org/ports/zsystems/tumbleweed/repo/oss/
 #metalink=https://download.opensuse.org/ports/zsystems/tumbleweed/repo/oss/repodata/repomd.xml.metalink
 {% endif %}