diff --git a/prepopulate.json b/prepopulate.json
index 85fb754..50bf665 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -34454,7 +34454,7 @@
         "gnome-menus-devel.ppc64le"
       ],
       "gnome-online-accounts": [
-        "gnome-online-accounts-devel.pcc64le"
+        "gnome-online-accounts-devel.ppc64le"
       ],
       "gobject-introspection": [
         "gobject-introspection-devel.ppc64le"
@@ -36136,7 +36136,7 @@
         "enchant2-devel.s390x"
       ],
       "evolution": [
-        "evolution-data-server-devel.s390x,
+        "evolution-data-server-devel.s390x",
         "evolution-data-server-doc.noarch",
         "evolution-data-server-tests.s390x"
       ],
diff --git a/prepopulate.yaml b/prepopulate.yaml
index 25903cb..e19bfc5 100644
--- a/prepopulate.yaml
+++ b/prepopulate.yaml
@@ -189,8 +189,6 @@ AppStream:
     - avahi-glib.aarch64
     babeltrace:
     - libbabeltrace.aarch64
-    babl:
-    - babl.aarch64
     baobab:
     - baobab.aarch64
     bcc:
@@ -348,7 +346,7 @@ AppStream:
     cloud-init:
     - cloud-init.noarch
     cloud-utils:
-    - cloud-utils-growpart.aarch64
+    - cloud-utils-growpart.noarch
     cmake:
     - cmake-data.noarch
     - cmake-doc.noarch
@@ -560,11 +558,8 @@ AppStream:
     - evince-thumbnailer.aarch64
     - evince.aarch64
     evolution-data-server:
-    - evolution-data-server-devel.aarch64
-    - evolution-data-server-doc.noarch
     - evolution-data-server-langpacks.noarch
     - evolution-data-server-perl.aarch64
-    - evolution-data-server-tests.aarch64
     - evolution-data-server.aarch64
     exempi:
     - exempi.aarch64
@@ -828,7 +823,6 @@ AppStream:
     gnome-menus:
     - gnome-menus.aarch64
     gnome-online-accounts:
-    - gnome-online-accounts-devel.aarch64
     - gnome-online-accounts.aarch64
     gnome-remote-desktop:
     - gnome-remote-desktop.aarch64
@@ -4027,17 +4021,13 @@ AppStream:
     readline:
     - readline-devel.aarch64
     redfish-finder:
-    - redfish-finder.noarch
+    - redfish-finder.aarch64
     redhat-fonts:
     - redhat-display-fonts.noarch
     - redhat-mono-fonts.noarch
     - redhat-text-fonts.noarch
     redhat-rpm-config:
     - redhat-rpm-config.noarch
-    redis:
-    - redis-devel.aarch64
-    - redis-doc.noarch
-    - redis.aarch64
     regexp:
     - regexp.noarch
     rest:
@@ -4208,9 +4198,6 @@ AppStream:
     - python3-scapy.noarch
     scipy:
     - python3-scipy.aarch64
-    scl-utils:
-    - scl-utils-build.aarch64
-    - scl-utils.aarch64
     scrub:
     - scrub.aarch64
     sdl12-compat:
@@ -5268,8 +5255,6 @@ AppStream:
     - avahi-glib.ppc64le
     babeltrace:
     - libbabeltrace.ppc64le
-    babl:
-    - babl.ppc64le
     baobab:
     - baobab.ppc64le
     bcc:
@@ -5428,7 +5413,7 @@ AppStream:
     cloud-init:
     - cloud-init.noarch
     cloud-utils:
-    - cloud-utils-growpart.ppc64le
+    - cloud-utils-growpart.noarch
     cmake:
     - cmake-data.noarch
     - cmake-doc.noarch
@@ -5634,11 +5619,8 @@ AppStream:
     - evince-thumbnailer.ppc64le
     - evince.ppc64le
     evolution-data-server:
-    - evolution-data-server-devel.ppc64le
-    - evolution-data-server-doc.noarch
     - evolution-data-server-langpacks.noarch
     - evolution-data-server-perl.ppc64le
-    - evolution-data-server-tests.ppc64le
     - evolution-data-server.ppc64le
     exempi:
     - exempi.ppc64le
@@ -5902,7 +5884,6 @@ AppStream:
     gnome-menus:
     - gnome-menus.ppc64le
     gnome-online-accounts:
-    - gnome-online-accounts-devel.ppc64le
     - gnome-online-accounts.ppc64le
     gnome-remote-desktop:
     - gnome-remote-desktop.ppc64le
@@ -9057,10 +9038,6 @@ AppStream:
     - redhat-text-fonts.noarch
     redhat-rpm-config:
     - redhat-rpm-config.noarch
-    redis:
-    - redis-devel.ppc64le
-    - redis-doc.noarch
-    - redis.ppc64le
     regexp:
     - regexp.noarch
     rest:
@@ -9233,9 +9210,6 @@ AppStream:
     - python3-scapy.noarch
     scipy:
     - python3-scipy.ppc64le
-    scl-utils:
-    - scl-utils-build.ppc64le
-    - scl-utils.ppc64le
     scrub:
     - scrub.ppc64le
     sdl12-compat:
@@ -10274,8 +10248,6 @@ AppStream:
     - avahi-glib.s390x
     babeltrace:
     - libbabeltrace.s390x
-    babl:
-    - babl.s390x
     baobab:
     - baobab.s390x
     bcc:
@@ -10429,7 +10401,7 @@ AppStream:
     cloud-init:
     - cloud-init.noarch
     cloud-utils:
-    - cloud-utils-growpart.s390x
+    - cloud-utils-growpart.noarch
     cmake:
     - cmake-data.noarch
     - cmake-doc.noarch
@@ -10626,11 +10598,8 @@ AppStream:
     - evince-thumbnailer.s390x
     - evince.s390x
     evolution-data-server:
-    - evolution-data-server-devel.s390x
-    - evolution-data-server-doc.noarch
     - evolution-data-server-langpacks.noarch
     - evolution-data-server-perl.s390x
-    - evolution-data-server-tests.s390x
     - evolution-data-server.s390x
     exempi:
     - exempi.s390x
@@ -10881,7 +10850,6 @@ AppStream:
     gnome-menus:
     - gnome-menus.s390x
     gnome-online-accounts:
-    - gnome-online-accounts-devel.s390x
     - gnome-online-accounts.s390x
     gnome-remote-desktop:
     - gnome-remote-desktop.s390x
@@ -11102,8 +11070,6 @@ AppStream:
     - gvfs-devel.s390x
     - gvfs-fuse.s390x
     - gvfs-goa.s390x
-    - gvfs-gphoto2.s390x
-    - gvfs-mtp.s390x
     - gvfs-smb.s390x
     - gvfs.s390x
     hamcrest:
@@ -14037,10 +14003,6 @@ AppStream:
     - redhat-text-fonts.noarch
     redhat-rpm-config:
     - redhat-rpm-config.noarch
-    redis:
-    - redis-devel.s390x
-    - redis-doc.noarch
-    - redis.s390x
     regexp:
     - regexp.noarch
     rest:
@@ -14224,9 +14186,6 @@ AppStream:
     - python3-scapy.noarch
     scipy:
     - python3-scipy.s390x
-    scl-utils:
-    - scl-utils-build.s390x
-    - scl-utils.s390x
     scrub:
     - scrub.s390x
     sdl12-compat:
@@ -15276,8 +15235,6 @@ AppStream:
     - avahi-glib.x86_64
     babeltrace:
     - libbabeltrace.x86_64
-    babl:
-    - babl.x86_64
     baobab:
     - baobab.x86_64
     bcc:
@@ -15438,7 +15395,7 @@ AppStream:
     cloud-init:
     - cloud-init.noarch
     cloud-utils:
-    - cloud-utils-growpart.x86_64
+    - cloud-utils-growpart.noarch
     cmake:
     - cmake-data.noarch
     - cmake-doc.noarch
@@ -15657,11 +15614,8 @@ AppStream:
     - evince-thumbnailer.x86_64
     - evince.x86_64
     evolution-data-server:
-    - evolution-data-server-devel.x86_64
-    - evolution-data-server-doc.noarch
     - evolution-data-server-langpacks.noarch
     - evolution-data-server-perl.x86_64
-    - evolution-data-server-tests.x86_64
     - evolution-data-server.x86_64
     exempi:
     - exempi.x86_64
@@ -15943,7 +15897,6 @@ AppStream:
     gnome-menus:
     - gnome-menus.x86_64
     gnome-online-accounts:
-    - gnome-online-accounts-devel.x86_64
     - gnome-online-accounts.x86_64
     gnome-remote-desktop:
     - gnome-remote-desktop.x86_64
@@ -19178,17 +19131,13 @@ AppStream:
     rear:
     - rear.x86_64
     redfish-finder:
-    - redfish-finder.noarch
+    - redfish-finder.x86_64
     redhat-fonts:
     - redhat-display-fonts.noarch
     - redhat-mono-fonts.noarch
     - redhat-text-fonts.noarch
     redhat-rpm-config:
     - redhat-rpm-config.noarch
-    redis:
-    - redis-devel.x86_64
-    - redis-doc.noarch
-    - redis.x86_64
     regexp:
     - regexp.noarch
     rest:
@@ -19364,9 +19313,6 @@ AppStream:
     - python3-scapy.noarch
     scipy:
     - python3-scipy.x86_64
-    scl-utils:
-    - scl-utils-build.x86_64
-    - scl-utils.x86_64
     scrub:
     - scrub.x86_64
     sdl12-compat:
@@ -25160,9 +25106,6 @@ CRB:
     - babel-doc.noarch
     babeltrace:
     - libbabeltrace-devel.aarch64
-    babl:
-    - babl-devel-docs.noarch
-    - babl-devel.aarch64
     bash:
     - bash-devel.aarch64
     bcc:
@@ -25281,6 +25224,10 @@ CRB:
     - eigen3-devel.noarch
     enchant2:
     - enchant2-devel.aarch64
+    evolution:
+    - evolution-data-server-devel.aarch64
+    - evolution-data-server-doc.noarch
+    - evolution-data-server-tests.aarch64
     execstack:
     - execstack.aarch64
     exempi:
@@ -25365,6 +25312,8 @@ CRB:
     - gnome-bluetooth-libs-devel.aarch64
     gnome-menus:
     - gnome-menus-devel.aarch64
+    gnome-online-accounts:
+    - gnome-online-accounts-devel.aarch64
     gnu-efi:
     - gnu-efi-devel.noarch
     gobject-introspection:
@@ -26408,9 +26357,6 @@ CRB:
     - babel-doc.noarch
     babeltrace:
     - libbabeltrace-devel.ppc64le
-    babl:
-    - babl-devel-docs.noarch
-    - babl-devel.ppc64le
     bash:
     - bash-devel.ppc64le
     bcc:
@@ -26526,6 +26472,10 @@ CRB:
     - eigen3-devel.noarch
     enchant2:
     - enchant2-devel.ppc64le
+    evolution:
+    - evolution-data-server-devel.ppc64le
+    - evolution-data-server-doc.noarch
+    - evolution-data-server-tests.ppc64le
     execstack:
     - execstack.ppc64le
     exempi:
@@ -26610,6 +26560,8 @@ CRB:
     - gnome-bluetooth-libs-devel.ppc64le
     gnome-menus:
     - gnome-menus-devel.ppc64le
+    gnome-online-accounts:
+    - gnome-online-accounts-devel.ppc64le
     gobject-introspection:
     - gobject-introspection-devel.ppc64le
     gpgme:
@@ -27678,9 +27630,6 @@ CRB:
     - babel-doc.noarch
     babeltrace:
     - libbabeltrace-devel.s390x
-    babl:
-    - babl-devel-docs.noarch
-    - babl-devel.s390x
     bash:
     - bash-devel.s390x
     bcc:
@@ -27793,6 +27742,10 @@ CRB:
     - eigen3-devel.noarch
     enchant2:
     - enchant2-devel.s390x
+    evolution:
+    - evolution-data-server-devel.s390x
+    - evolution-data-server-doc.noarch
+    - evolution-data-server-tests.s390x
     execstack:
     - execstack.s390x
     exempi:
@@ -27875,6 +27828,8 @@ CRB:
     - glibmm2.68-doc.noarch
     gnome-menus:
     - gnome-menus-devel.s390x
+    gnome-online-accounts:
+    - gnome-online-accounts-devel.s390x
     gobject-introspection:
     - gobject-introspection-devel.s390x
     gpgme:
@@ -28948,9 +28903,6 @@ CRB:
     - babel-doc.noarch
     babeltrace:
     - libbabeltrace-devel.x86_64
-    babl:
-    - babl-devel-docs.noarch
-    - babl-devel.x86_64
     bash:
     - bash-devel.x86_64
     bcc:
@@ -29067,6 +29019,10 @@ CRB:
     - eigen3-devel.noarch
     enchant2:
     - enchant2-devel.x86_64
+    evolution:
+    - evolution-data-server-devel.x86_64
+    - evolution-data-server-doc.noarch
+    - evolution-data-server-tests.x86_64
     execstack:
     - execstack.x86_64
     exempi:
@@ -29151,6 +29107,8 @@ CRB:
     - gnome-bluetooth-libs-devel.x86_64
     gnome-menus:
     - gnome-menus-devel.x86_64
+    gnome-online-accounts:
+    - gnome-online-accounts-devel.x86_64
     gnu-efi:
     - gnu-efi-devel.noarch
     gobject-introspection: