diff --git a/data/distrodefs/fedora/imagetypes.yaml b/data/distrodefs/fedora/imagetypes.yaml
index 9f9c88d4f5..546579e9ab 100644
--- a/data/distrodefs/fedora/imagetypes.yaml
+++ b/data/distrodefs/fedora/imagetypes.yaml
@@ -121,8 +121,6 @@
       - "systemd"
       - "tar"
       - "thai-scalable-waree-fonts"
-      - "tigervnc-server-minimal"
-      - "tigervnc-server-module"
       - "udisks2"
       - "udisks2-iscsi"
       - "usbutils"
@@ -139,6 +137,13 @@
       - "xrdb"
       - "xz"
     conditions:
+      "f41 and below use tigervnc":
+        when:
+          version_less_than: "42"
+        append:
+          include:
+            - "tigervnc-server-minimal"
+            - "tigervnc-server-module"
       "x86_64 specific anaconda pkgs":
         when:
           arch: "x86_64"
@@ -2193,8 +2198,6 @@ image_types:
             - openssh-server
             - nfs-utils
             - openssh-clients
-            - tigervnc-server-minimal
-            - tigervnc-server-module
             - net-tools
             - bridge-utils
             - nmap-ncat
@@ -2234,6 +2237,13 @@ image_types:
             - hexedit
             - sg3_utils
           conditions:
+            "f41 and below use tigervnc":
+              when:
+                version_less_than: "42"
+              append:
+                include:
+                  - "tigervnc-server-minimal"
+                  - "tigervnc-server-module"
             "x86_64 specific anaconda pkgs":
               when:
                 arch: "x86_64"
diff --git a/test/data/manifest-checksums/fedora_42-aarch64-everything_netinst-empty b/test/data/manifest-checksums/fedora_42-aarch64-everything_netinst-empty
index cb6a90fa86..e910784d5e 100644
--- a/test/data/manifest-checksums/fedora_42-aarch64-everything_netinst-empty
+++ b/test/data/manifest-checksums/fedora_42-aarch64-everything_netinst-empty
@@ -1 +1 @@
-0d03b7144021cc07b76c9d0a4e683c7d6377f574
+18983cc7d7bbdc854618ccca6f15b73f2c47c849
diff --git a/test/data/manifest-checksums/fedora_42-aarch64-iot_installer-iot_ostree_pull_empty b/test/data/manifest-checksums/fedora_42-aarch64-iot_installer-iot_ostree_pull_empty
index 243c2b6f9d..1a33bf1281 100644
--- a/test/data/manifest-checksums/fedora_42-aarch64-iot_installer-iot_ostree_pull_empty
+++ b/test/data/manifest-checksums/fedora_42-aarch64-iot_installer-iot_ostree_pull_empty
@@ -1 +1 @@
-e8af3b0fe61f0fff385e8029f7efd6f9d192b7b6
+ad9353c817a744b101253463f50dd31396f327ab
diff --git a/test/data/manifest-checksums/fedora_42-aarch64-iot_installer-unattended_iso_iot b/test/data/manifest-checksums/fedora_42-aarch64-iot_installer-unattended_iso_iot
index 4c8af4d2fe..b44c826b07 100644
--- a/test/data/manifest-checksums/fedora_42-aarch64-iot_installer-unattended_iso_iot
+++ b/test/data/manifest-checksums/fedora_42-aarch64-iot_installer-unattended_iso_iot
@@ -1 +1 @@
-d7318e8741045c80191eec65c90de1885f6e4b87
+718c95c69f86b67a71e1700db23d84c0df45d4a0
diff --git a/test/data/manifest-checksums/fedora_42-aarch64-minimal_installer-empty b/test/data/manifest-checksums/fedora_42-aarch64-minimal_installer-empty
index 5158cad5ee..eb510e04ae 100644
--- a/test/data/manifest-checksums/fedora_42-aarch64-minimal_installer-empty
+++ b/test/data/manifest-checksums/fedora_42-aarch64-minimal_installer-empty
@@ -1 +1 @@
-19403b36a23462760ab41020c21e7b126ccd0ce2
+d03ae953a9eee6b88bbacf646f3e44497649a07a
diff --git a/test/data/manifest-checksums/fedora_42-aarch64-minimal_installer-unattended_iso b/test/data/manifest-checksums/fedora_42-aarch64-minimal_installer-unattended_iso
index 07167d425b..978126ff42 100644
--- a/test/data/manifest-checksums/fedora_42-aarch64-minimal_installer-unattended_iso
+++ b/test/data/manifest-checksums/fedora_42-aarch64-minimal_installer-unattended_iso
@@ -1 +1 @@
-e33d56cafd34afce4edb5c5f45b097286384208a
+a4fdc8fdb6fcaf16a71cfb3f52245186f81e8928
diff --git a/test/data/manifest-checksums/fedora_42-x86_64-everything_netinst-empty b/test/data/manifest-checksums/fedora_42-x86_64-everything_netinst-empty
index 465d69a047..f2e61cec68 100644
--- a/test/data/manifest-checksums/fedora_42-x86_64-everything_netinst-empty
+++ b/test/data/manifest-checksums/fedora_42-x86_64-everything_netinst-empty
@@ -1 +1 @@
-e7585282e088423c2d76fbecf0bef70f94babe56
+a2ee3e16948becd262570e422e85384fae6245df
diff --git a/test/data/manifest-checksums/fedora_42-x86_64-iot_installer-iot_ostree_pull_empty b/test/data/manifest-checksums/fedora_42-x86_64-iot_installer-iot_ostree_pull_empty
index ea17bddd9b..cc875a5fbb 100644
--- a/test/data/manifest-checksums/fedora_42-x86_64-iot_installer-iot_ostree_pull_empty
+++ b/test/data/manifest-checksums/fedora_42-x86_64-iot_installer-iot_ostree_pull_empty
@@ -1 +1 @@
-28926454a0e072c6c86589fe9157937d257818cd
+6c59218e5cca61cb784906909e4a4850b961d21e
diff --git a/test/data/manifest-checksums/fedora_42-x86_64-iot_installer-unattended_iso_iot b/test/data/manifest-checksums/fedora_42-x86_64-iot_installer-unattended_iso_iot
index a9effe86fa..14d398745b 100644
--- a/test/data/manifest-checksums/fedora_42-x86_64-iot_installer-unattended_iso_iot
+++ b/test/data/manifest-checksums/fedora_42-x86_64-iot_installer-unattended_iso_iot
@@ -1 +1 @@
-27589818aced0a4cade5212637ee82dd0920a42b
+ff6722f71a2790370457c34d37f24f3768f7b884
diff --git a/test/data/manifest-checksums/fedora_42-x86_64-minimal_installer-empty b/test/data/manifest-checksums/fedora_42-x86_64-minimal_installer-empty
index c1932a9bd9..f23017ae62 100644
--- a/test/data/manifest-checksums/fedora_42-x86_64-minimal_installer-empty
+++ b/test/data/manifest-checksums/fedora_42-x86_64-minimal_installer-empty
@@ -1 +1 @@
-37460b6ebbd9ba96fbf2332b423b65b2f282633a
+f612d95d8b3d5114d1821ad85847fe2252386c7a
diff --git a/test/data/manifest-checksums/fedora_42-x86_64-minimal_installer-unattended_iso b/test/data/manifest-checksums/fedora_42-x86_64-minimal_installer-unattended_iso
index b0d147e1a2..1b73cd032e 100644
--- a/test/data/manifest-checksums/fedora_42-x86_64-minimal_installer-unattended_iso
+++ b/test/data/manifest-checksums/fedora_42-x86_64-minimal_installer-unattended_iso
@@ -1 +1 @@
-b480facf753473f328afeb7bd3efa4dc466d0ce1
+dd32e9a1fc485c3b42d5961321bb386bc28362c8
diff --git a/test/data/manifest-checksums/fedora_43-aarch64-everything_netinst-empty b/test/data/manifest-checksums/fedora_43-aarch64-everything_netinst-empty
index 5de1e4291c..91cd7c73b9 100644
--- a/test/data/manifest-checksums/fedora_43-aarch64-everything_netinst-empty
+++ b/test/data/manifest-checksums/fedora_43-aarch64-everything_netinst-empty
@@ -1 +1 @@
-1cf94798063c3cd894609c50194c2dcf550f9ccb
+f4df01aec36ec77dd504de133a731ad73d17dc40
diff --git a/test/data/manifest-checksums/fedora_43-aarch64-iot_installer-iot_ostree_pull_empty b/test/data/manifest-checksums/fedora_43-aarch64-iot_installer-iot_ostree_pull_empty
index bd3e066317..5403147b36 100644
--- a/test/data/manifest-checksums/fedora_43-aarch64-iot_installer-iot_ostree_pull_empty
+++ b/test/data/manifest-checksums/fedora_43-aarch64-iot_installer-iot_ostree_pull_empty
@@ -1 +1 @@
-230c2387da4873b2e8cf225c33058fc1b7e37fe0
+1a5d27b96c6dd21723111273444b35ae17888344
diff --git a/test/data/manifest-checksums/fedora_43-aarch64-iot_installer-unattended_iso_iot b/test/data/manifest-checksums/fedora_43-aarch64-iot_installer-unattended_iso_iot
index 624d9f0100..9d413cbba0 100644
--- a/test/data/manifest-checksums/fedora_43-aarch64-iot_installer-unattended_iso_iot
+++ b/test/data/manifest-checksums/fedora_43-aarch64-iot_installer-unattended_iso_iot
@@ -1 +1 @@
-a6435e5c991640689306e1b17b966fd4670ac2e1
+9dbdca51ee864c0453ed3eb98df27b23e8e5c993
diff --git a/test/data/manifest-checksums/fedora_43-aarch64-minimal_installer-empty b/test/data/manifest-checksums/fedora_43-aarch64-minimal_installer-empty
index 8949e226a3..2b344777c4 100644
--- a/test/data/manifest-checksums/fedora_43-aarch64-minimal_installer-empty
+++ b/test/data/manifest-checksums/fedora_43-aarch64-minimal_installer-empty
@@ -1 +1 @@
-ce110dddd72df88af39e78b4a79c2ad64edb92b9
+7a41d630c3912ec8d9fa442f9c4ba86e24dccf4f
diff --git a/test/data/manifest-checksums/fedora_43-aarch64-minimal_installer-unattended_iso b/test/data/manifest-checksums/fedora_43-aarch64-minimal_installer-unattended_iso
index 989b569328..aae34ec3fb 100644
--- a/test/data/manifest-checksums/fedora_43-aarch64-minimal_installer-unattended_iso
+++ b/test/data/manifest-checksums/fedora_43-aarch64-minimal_installer-unattended_iso
@@ -1 +1 @@
-b0b34a88ff5d03ed5c402321f68a9fc403b3bcdc
+a4fd0e02ef3b69d071f4f6a19446f96a2a1a3698
diff --git a/test/data/manifest-checksums/fedora_43-x86_64-everything_netinst-empty b/test/data/manifest-checksums/fedora_43-x86_64-everything_netinst-empty
index e9c9774c7d..02f8e9ddaf 100644
--- a/test/data/manifest-checksums/fedora_43-x86_64-everything_netinst-empty
+++ b/test/data/manifest-checksums/fedora_43-x86_64-everything_netinst-empty
@@ -1 +1 @@
-2e4a33c8fe8a17e17e8934905a461a767387fcc2
+203add58e7c84df788492245c40998a1cd82dc01
diff --git a/test/data/manifest-checksums/fedora_43-x86_64-iot_installer-iot_ostree_pull_empty b/test/data/manifest-checksums/fedora_43-x86_64-iot_installer-iot_ostree_pull_empty
index f453a0f7fd..ea6a9501b3 100644
--- a/test/data/manifest-checksums/fedora_43-x86_64-iot_installer-iot_ostree_pull_empty
+++ b/test/data/manifest-checksums/fedora_43-x86_64-iot_installer-iot_ostree_pull_empty
@@ -1 +1 @@
-5058f78214f8bdff7781bbaf71ef21e2c0373d50
+40ebcadb4109aedb5f7d563687eed5bcb6219bbf
diff --git a/test/data/manifest-checksums/fedora_43-x86_64-iot_installer-unattended_iso_iot b/test/data/manifest-checksums/fedora_43-x86_64-iot_installer-unattended_iso_iot
index 8cc351b7e0..249a230493 100644
--- a/test/data/manifest-checksums/fedora_43-x86_64-iot_installer-unattended_iso_iot
+++ b/test/data/manifest-checksums/fedora_43-x86_64-iot_installer-unattended_iso_iot
@@ -1 +1 @@
-40df02837c334a064036a77c23d16398c545b34a
+62506f3f371c8425bd84148bcc7692e6dab49c43
diff --git a/test/data/manifest-checksums/fedora_43-x86_64-minimal_installer-empty b/test/data/manifest-checksums/fedora_43-x86_64-minimal_installer-empty
index fa6a45be63..e1524c5e14 100644
--- a/test/data/manifest-checksums/fedora_43-x86_64-minimal_installer-empty
+++ b/test/data/manifest-checksums/fedora_43-x86_64-minimal_installer-empty
@@ -1 +1 @@
-91500501512fec2bd00a77dbf4b6d5abe8ed7610
+55b9d9ba9180ac5377c737fd0f17eae549560694
diff --git a/test/data/manifest-checksums/fedora_43-x86_64-minimal_installer-unattended_iso b/test/data/manifest-checksums/fedora_43-x86_64-minimal_installer-unattended_iso
index 817020ac6d..a72b811bb2 100644
--- a/test/data/manifest-checksums/fedora_43-x86_64-minimal_installer-unattended_iso
+++ b/test/data/manifest-checksums/fedora_43-x86_64-minimal_installer-unattended_iso
@@ -1 +1 @@
-8c53066655fe3fb95ea841ac96d930338d0a84bd
+0a595d0e0e3fb30e9727140e04a07f42ba3ad282
diff --git a/test/data/manifest-checksums/fedora_44-aarch64-everything_netinst-empty b/test/data/manifest-checksums/fedora_44-aarch64-everything_netinst-empty
index 7d18d9eb7b..0e7f20256c 100644
--- a/test/data/manifest-checksums/fedora_44-aarch64-everything_netinst-empty
+++ b/test/data/manifest-checksums/fedora_44-aarch64-everything_netinst-empty
@@ -1 +1 @@
-01ce37e14ffbc1a3a8dff4fd2ac0ed2aff8f64f0
+442f81e36463872f78344f784d77c7269ededf2b
diff --git a/test/data/manifest-checksums/fedora_44-aarch64-iot_installer-iot_ostree_pull_empty b/test/data/manifest-checksums/fedora_44-aarch64-iot_installer-iot_ostree_pull_empty
index 406503c109..eff6a8d10f 100644
--- a/test/data/manifest-checksums/fedora_44-aarch64-iot_installer-iot_ostree_pull_empty
+++ b/test/data/manifest-checksums/fedora_44-aarch64-iot_installer-iot_ostree_pull_empty
@@ -1 +1 @@
-02c4517a1aa7cde8c3ef997a4666df97daabf3be
+b81e105028e6fde0e6e74a8be81d43af9ec53af6
diff --git a/test/data/manifest-checksums/fedora_44-aarch64-iot_installer-unattended_iso_iot b/test/data/manifest-checksums/fedora_44-aarch64-iot_installer-unattended_iso_iot
index 41fc9bf1dd..a15ab115fb 100644
--- a/test/data/manifest-checksums/fedora_44-aarch64-iot_installer-unattended_iso_iot
+++ b/test/data/manifest-checksums/fedora_44-aarch64-iot_installer-unattended_iso_iot
@@ -1 +1 @@
-6fa768dfe782703c782f62f50174c0a8cf756699
+65325ee291e48e7f09315f1b35d0aac1d5bb3108
diff --git a/test/data/manifest-checksums/fedora_44-aarch64-minimal_installer-empty b/test/data/manifest-checksums/fedora_44-aarch64-minimal_installer-empty
index d512bd98ca..268f8f350f 100644
--- a/test/data/manifest-checksums/fedora_44-aarch64-minimal_installer-empty
+++ b/test/data/manifest-checksums/fedora_44-aarch64-minimal_installer-empty
@@ -1 +1 @@
-b8e9366beeec6781dd68f5b6c30145200258a944
+51e1b04fbbfc287d2a942dca1ca2ac043089617b
diff --git a/test/data/manifest-checksums/fedora_44-aarch64-minimal_installer-unattended_iso b/test/data/manifest-checksums/fedora_44-aarch64-minimal_installer-unattended_iso
index b728f4648d..9fc3893dc2 100644
--- a/test/data/manifest-checksums/fedora_44-aarch64-minimal_installer-unattended_iso
+++ b/test/data/manifest-checksums/fedora_44-aarch64-minimal_installer-unattended_iso
@@ -1 +1 @@
-3f81ca8afd2d5edc29c531ba7576489cfc723eaf
+781df4692d1d70f878c086ec37fe6e287c1ca3a0
diff --git a/test/data/manifest-checksums/fedora_44-x86_64-everything_netinst-empty b/test/data/manifest-checksums/fedora_44-x86_64-everything_netinst-empty
index 9a385cf97f..ecf9105694 100644
--- a/test/data/manifest-checksums/fedora_44-x86_64-everything_netinst-empty
+++ b/test/data/manifest-checksums/fedora_44-x86_64-everything_netinst-empty
@@ -1 +1 @@
-ed4f8e866475bc134046691ff93f7949fac607c6
+94adfe92c7289e653055b47273bf7cb41b7ba84f
diff --git a/test/data/manifest-checksums/fedora_44-x86_64-iot_installer-iot_ostree_pull_empty b/test/data/manifest-checksums/fedora_44-x86_64-iot_installer-iot_ostree_pull_empty
index 276b269d12..86b7258646 100644
--- a/test/data/manifest-checksums/fedora_44-x86_64-iot_installer-iot_ostree_pull_empty
+++ b/test/data/manifest-checksums/fedora_44-x86_64-iot_installer-iot_ostree_pull_empty
@@ -1 +1 @@
-cc54a7f0dd597f324227d3287db7942b73b40146
+716d3e02c4951b161bc22163926c7136b8a62862
diff --git a/test/data/manifest-checksums/fedora_44-x86_64-iot_installer-unattended_iso_iot b/test/data/manifest-checksums/fedora_44-x86_64-iot_installer-unattended_iso_iot
index 6b25889a3d..968772e5fd 100644
--- a/test/data/manifest-checksums/fedora_44-x86_64-iot_installer-unattended_iso_iot
+++ b/test/data/manifest-checksums/fedora_44-x86_64-iot_installer-unattended_iso_iot
@@ -1 +1 @@
-456b3cb887c09bb8da01f9194eda7ee7f947ee6c
+145c7876a3c066cd0eeee860e8603b7f02dae11f
diff --git a/test/data/manifest-checksums/fedora_44-x86_64-minimal_installer-empty b/test/data/manifest-checksums/fedora_44-x86_64-minimal_installer-empty
index 31b2560502..c2c8e4f67f 100644
--- a/test/data/manifest-checksums/fedora_44-x86_64-minimal_installer-empty
+++ b/test/data/manifest-checksums/fedora_44-x86_64-minimal_installer-empty
@@ -1 +1 @@
-5c49ba4f56960cd69e918a21865e38c3fcf8c983
+93b2e588a3b1fe2cc9ed0e5186b9f7efbb572d1a
diff --git a/test/data/manifest-checksums/fedora_44-x86_64-minimal_installer-unattended_iso b/test/data/manifest-checksums/fedora_44-x86_64-minimal_installer-unattended_iso
index 131e552514..f2aa132972 100644
--- a/test/data/manifest-checksums/fedora_44-x86_64-minimal_installer-unattended_iso
+++ b/test/data/manifest-checksums/fedora_44-x86_64-minimal_installer-unattended_iso
@@ -1 +1 @@
-20079b1b99300aeae16c6f43022a2dc62e5ae048
+0646251c6a860b58fe849815f7d055494fd660d5