diff --git a/aarch64/include_exclude.conf b/aarch64/include_exclude.conf
index 0ac1e20..b594781 100644
--- a/aarch64/include_exclude.conf
+++ b/aarch64/include_exclude.conf
@@ -1,7 +1,7 @@
 filter_packages = [
     (
         '^(BaseOS|AppStream|CRB)$', {
-            '${arch}': [
+            'aarch64': [
                 "insights-client",
                 "libreport-plugin-rhtsupport",
                 "libreport-rhel",
@@ -38,7 +38,7 @@ filter_packages = [
     ),
     (
         '^(BaseOS)$', {
-            '${arch}': [
+            'aarch64': [
                 "perl-Net-SSLeay",
                 "perl-Mozilla-CA",
                 "perl-IO-Socket-SSL",
@@ -47,7 +47,7 @@ filter_packages = [
     ),
     (
         '^(AppStream)$', {
-            '${arch}': [
+            'aarch64': [
                 "java-1.8.0-openjdk-slowdebug",
                 "java-1.8.0-openjdk-headless-slowdebug",
                 "sos",
diff --git a/ppc64le/include_exclude.conf b/ppc64le/include_exclude.conf
index f793a40..aacc705 100644
--- a/ppc64le/include_exclude.conf
+++ b/ppc64le/include_exclude.conf
@@ -1,7 +1,7 @@
 filter_packages = [
     (
         '^(BaseOS|AppStream|CRB)$', {
-            '${arch}': [
+            'ppc64le': [
                 "insights-client",
                 "libreport-plugin-rhtsupport",
                 "libreport-rhel",
@@ -38,7 +38,7 @@ filter_packages = [
     ),
     (
         '^(BaseOS)$', {
-            '${arch}': [
+            'ppc64le': [
                 "perl-Net-SSLeay",
                 "perl-Mozilla-CA",
                 "perl-IO-Socket-SSL",
@@ -47,7 +47,7 @@ filter_packages = [
     ),
     (
         '^(AppStream)$', {
-            '${arch}': [
+            'ppc64le': [
                 "java-1.8.0-openjdk-slowdebug",
                 "java-1.8.0-openjdk-headless-slowdebug",
                 "sos",
diff --git a/s390x/include_exclude.conf b/s390x/include_exclude.conf
index e1a2109..9931a04 100644
--- a/s390x/include_exclude.conf
+++ b/s390x/include_exclude.conf
@@ -1,7 +1,7 @@
 filter_packages = [
     (
         '^(BaseOS|AppStream|CRB)$', {
-            '${arch}': [
+            's390x': [
                 "insights-client",
                 "libreport-plugin-rhtsupport",
                 "libreport-rhel",
@@ -39,7 +39,7 @@ filter_packages = [
     ),
     (
         '^(BaseOS)$', {
-            '${arch}': [
+            's390x': [
                 "perl-Net-SSLeay",
                 "perl-Mozilla-CA",
                 "perl-IO-Socket-SSL",
@@ -48,7 +48,7 @@ filter_packages = [
     ),
     (
         '^(AppStream)$', {
-            '${arch}': [
+            's390x': [
                 "java-1.8.0-openjdk-slowdebug",
                 "java-1.8.0-openjdk-headless-slowdebug",
                 "sos",
diff --git a/x86_64/include_exclude.conf b/x86_64/include_exclude.conf
index a49ce7c..952f379 100644
--- a/x86_64/include_exclude.conf
+++ b/x86_64/include_exclude.conf
@@ -1,7 +1,7 @@
 filter_packages = [
     (
         '^(BaseOS|AppStream|CRB)$', {
-            '${arch}': [
+            'x86_64': [
                 "insights-client",
                 "libreport-plugin-rhtsupport",
                 "libreport-rhel",
@@ -49,7 +49,7 @@ filter_packages = [
     ),
     (
         '^(BaseOS)$', {
-            '${arch}': [
+            'x86_64': [
                 "perl-Net-SSLeay",
                 "perl-Mozilla-CA",
                 "perl-IO-Socket-SSL",
@@ -60,7 +60,7 @@ filter_packages = [
     ),
     (
         '^(AppStream)$', {
-            '${arch}': [
+            'x86_64': [
                 "java-1.8.0-openjdk-slowdebug",
                 "java-1.8.0-openjdk-headless-slowdebug",
                 "libvirt-glib.i686",