diff --git a/prepopulate.json b/prepopulate.json
index 04ebaba..85fb754 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -248,9 +248,6 @@
       "babeltrace": [
         "libbabeltrace.aarch64"
       ],
-      "babl": [
-        "babl.aarch64"
-      ],
       "baobab": [
         "baobab.aarch64"
       ],
@@ -450,7 +447,7 @@
         "cloud-init.noarch"
       ],
       "cloud-utils": [
-        "cloud-utils-growpart.aarch64"
+        "cloud-utils-growpart.noarch"
       ],
       "cmake": [
         "cmake-data.noarch",
@@ -731,11 +728,8 @@
         "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": [
@@ -1079,7 +1073,6 @@
         "gnome-menus.aarch64"
       ],
       "gnome-online-accounts": [
-        "gnome-online-accounts-devel.aarch64",
         "gnome-online-accounts.aarch64"
       ],
       "gnome-remote-desktop": [
@@ -6780,9 +6773,6 @@
       "babeltrace": [
         "libbabeltrace.ppc64le"
       ],
-      "babl": [
-        "babl.ppc64le"
-      ],
       "baobab": [
         "baobab.ppc64le"
       ],
@@ -6983,7 +6973,7 @@
         "cloud-init.noarch"
       ],
       "cloud-utils": [
-        "cloud-utils-growpart.ppc64le"
+        "cloud-utils-growpart.noarch"
       ],
       "cmake": [
         "cmake-data.noarch",
@@ -7255,11 +7245,8 @@
         "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": [
@@ -7603,7 +7590,6 @@
         "gnome-menus.ppc64le"
       ],
       "gnome-online-accounts": [
-        "gnome-online-accounts-devel.ppc64le",
         "gnome-online-accounts.ppc64le"
       ],
       "gnome-remote-desktop": [
@@ -13223,9 +13209,6 @@
       "babeltrace": [
         "libbabeltrace.s390x"
       ],
-      "babl": [
-        "babl.s390x"
-      ],
       "baobab": [
         "baobab.s390x"
       ],
@@ -13420,7 +13403,7 @@
         "cloud-init.noarch"
       ],
       "cloud-utils": [
-        "cloud-utils-growpart.s390x"
+        "cloud-utils-growpart.noarch"
       ],
       "cmake": [
         "cmake-data.noarch",
@@ -13680,11 +13663,8 @@
         "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": [
@@ -14011,7 +13991,6 @@
         "gnome-menus.s390x"
       ],
       "gnome-online-accounts": [
-        "gnome-online-accounts-devel.s390x",
         "gnome-online-accounts.s390x"
       ],
       "gnome-remote-desktop": [
@@ -14282,8 +14261,6 @@
         "gvfs-devel.s390x",
         "gvfs-fuse.s390x",
         "gvfs-goa.s390x",
-        "gvfs-gphoto2.s390x",
-        "gvfs-mtp.s390x",
         "gvfs-smb.s390x",
         "gvfs.s390x"
       ],
@@ -19651,9 +19628,6 @@
       "babeltrace": [
         "libbabeltrace.x86_64"
       ],
-      "babl": [
-        "babl.x86_64"
-      ],
       "baobab": [
         "baobab.x86_64"
       ],
@@ -19857,7 +19831,7 @@
         "cloud-init.noarch"
       ],
       "cloud-utils": [
-        "cloud-utils-growpart.x86_64"
+        "cloud-utils-growpart.noarch"
       ],
       "cmake": [
         "cmake-data.noarch",
@@ -20148,11 +20122,8 @@
         "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": [
@@ -20515,7 +20486,6 @@
         "gnome-menus.x86_64"
       ],
       "gnome-online-accounts": [
-        "gnome-online-accounts-devel.x86_64",
         "gnome-online-accounts.x86_64"
       ],
       "gnome-remote-desktop": [
@@ -32432,10 +32402,6 @@
       "babeltrace": [
         "libbabeltrace-devel.aarch64"
       ],
-      "babl": [
-        "babl-devel-docs.noarch",
-        "babl-devel.aarch64"
-      ],
       "bash": [
         "bash-devel.aarch64"
       ],
@@ -32598,6 +32564,11 @@
       "enchant2": [
         "enchant2-devel.aarch64"
       ],
+      "evolution": [
+        "evolution-data-server-devel.aarch64",
+        "evolution-data-server-doc.noarch",
+        "evolution-data-server-tests.aarch64"
+      ],
       "execstack": [
         "execstack.aarch64"
       ],
@@ -32716,6 +32687,9 @@
       "gnome-menus": [
         "gnome-menus-devel.aarch64"
       ],
+      "gnome-online-accounts": [
+        "gnome-online-accounts-devel.aarch64"
+      ],
       "gnu-efi": [
         "gnu-efi-devel.noarch"
       ],
@@ -34198,10 +34172,6 @@
       "babeltrace": [
         "libbabeltrace-devel.ppc64le"
       ],
-      "babl": [
-        "babl-devel-docs.noarch",
-        "babl-devel.ppc64le"
-      ],
       "bash": [
         "bash-devel.ppc64le"
       ],
@@ -34360,6 +34330,11 @@
       "enchant2": [
         "enchant2-devel.ppc64le"
       ],
+      "evolution": [
+        "evolution-data-server-devel.ppc64le",
+        "evolution-data-server-doc.noarch",
+        "evolution-data-server-tests.ppc64le"
+      ],
       "execstack": [
         "execstack.ppc64le"
       ],
@@ -34478,6 +34453,9 @@
       "gnome-menus": [
         "gnome-menus-devel.ppc64le"
       ],
+      "gnome-online-accounts": [
+        "gnome-online-accounts-devel.pcc64le"
+      ],
       "gobject-introspection": [
         "gobject-introspection-devel.ppc64le"
       ],
@@ -36003,10 +35981,6 @@
       "babeltrace": [
         "libbabeltrace-devel.s390x"
       ],
-      "babl": [
-        "babl-devel-docs.noarch",
-        "babl-devel.s390x"
-      ],
       "bash": [
         "bash-devel.s390x"
       ],
@@ -36161,6 +36135,11 @@
       "enchant2": [
         "enchant2-devel.s390x"
       ],
+      "evolution": [
+        "evolution-data-server-devel.s390x,
+        "evolution-data-server-doc.noarch",
+        "evolution-data-server-tests.s390x"
+      ],
       "execstack": [
         "execstack.s390x"
       ],
@@ -36276,6 +36255,9 @@
       "gnome-menus": [
         "gnome-menus-devel.s390x"
       ],
+      "gnome-online-accounts": [
+        "gnome-online-accounts-devel.s390x"
+      ],
       "gobject-introspection": [
         "gobject-introspection-devel.s390x"
       ],
@@ -37807,10 +37789,6 @@
       "babeltrace": [
         "libbabeltrace-devel.x86_64"
       ],
-      "babl": [
-        "babl-devel-docs.noarch",
-        "babl-devel.x86_64"
-      ],
       "bash": [
         "bash-devel.x86_64"
       ],
@@ -37971,6 +37949,11 @@
       "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"
       ],
@@ -38089,6 +38072,9 @@
       "gnome-menus": [
         "gnome-menus-devel.x86_64"
       ],
+      "gnome-online-accounts": [
+        "gnome-online-accounts-devel.x86_64"
+      ],
       "gnu-efi": [
         "gnu-efi-devel.noarch"
       ],
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index fcf328d..049606a 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -139,7 +139,6 @@ additional_packages = [
             "cepces", #ENGCMP-3552
             "cepces-certmonger", #ENGCMP-3790
             "cepces-selinux", #ENGCMP-3803
-            "cloud-utils-growpart",
             "cups-browsed", #ENGCMP-3862
             "cups-filters-driverless", #ENGCMP-3862
             "cockpit-ostree", #ENGCMP-3233