diff --git a/prepopulate.json b/prepopulate.json
index 3ba6cb6..7d78951 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -126,8 +126,8 @@
         "ansible-collection-redhat-rhel_mgmt.noarch"
       ],
       "ansible-core": [
-        "ansible-core.aarch64",
-        "ansible-test.aarch64"
+        "ansible-core.noarch",
+        "ansible-test.noarch"
       ],
       "ansible-freeipa": [
         "ansible-freeipa-tests.noarch",
@@ -6631,8 +6631,8 @@
         "ansible-collection-redhat-rhel_mgmt.noarch"
       ],
       "ansible-core": [
-        "ansible-core.ppc64le",
-        "ansible-test.ppc64le"
+        "ansible-core.noarch",
+        "ansible-test.noarch"
       ],
       "ansible-freeipa": [
         "ansible-freeipa-tests.noarch",
@@ -13054,8 +13054,8 @@
         "ansible-collection-redhat-rhel_mgmt.noarch"
       ],
       "ansible-core": [
-        "ansible-core.s390x",
-        "ansible-test.s390x"
+        "ansible-core.noarch",
+        "ansible-test.noarch"
       ],
       "ansible-freeipa": [
         "ansible-freeipa-tests.noarch",
@@ -19471,8 +19471,8 @@
         "ansible-collection-redhat-rhel_mgmt.noarch"
       ],
       "ansible-core": [
-        "ansible-core.x86_64",
-        "ansible-test.x86_64"
+        "ansible-core.noarch",
+        "ansible-test.noarch"
       ],
       "ansible-freeipa": [
         "ansible-freeipa-tests.noarch",
diff --git a/prepopulate.yaml b/prepopulate.yaml
index edcdb3f..77fc71d 100644
--- a/prepopulate.yaml
+++ b/prepopulate.yaml
@@ -96,8 +96,8 @@ AppStream:
     ansible-collection-redhat-rhel_mgmt:
     - ansible-collection-redhat-rhel_mgmt.noarch
     ansible-core:
-    - ansible-core.aarch64
-    - ansible-test.aarch64
+    - ansible-core.noarch
+    - ansible-test.noarch
     ansible-freeipa:
     - ansible-freeipa-tests.noarch
     - ansible-freeipa.noarch
@@ -5153,8 +5153,8 @@ AppStream:
     ansible-collection-redhat-rhel_mgmt:
     - ansible-collection-redhat-rhel_mgmt.noarch
     ansible-core:
-    - ansible-core.ppc64le
-    - ansible-test.ppc64le
+    - ansible-core.noarch
+    - ansible-test.noarch
     ansible-freeipa:
     - ansible-freeipa-tests.noarch
     - ansible-freeipa.noarch
@@ -10142,8 +10142,8 @@ AppStream:
     ansible-collection-redhat-rhel_mgmt:
     - ansible-collection-redhat-rhel_mgmt.noarch
     ansible-core:
-    - ansible-core.s390x
-    - ansible-test.s390x
+    - ansible-core.noarch
+    - ansible-test.noarch
     ansible-freeipa:
     - ansible-freeipa-tests.noarch
     - ansible-freeipa.noarch
@@ -15133,8 +15133,8 @@ AppStream:
     ansible-collection-redhat-rhel_mgmt:
     - ansible-collection-redhat-rhel_mgmt.noarch
     ansible-core:
-    - ansible-core.x86_64
-    - ansible-test.x86_64
+    - ansible-core.noarch
+    - ansible-test.noarch
     ansible-freeipa:
     - ansible-freeipa-tests.noarch
     - ansible-freeipa.noarch