From 584ae47eca0b172a7647b70bc1954dc38981a457 Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Wed, 3 May 2023 15:28:33 +0200
Subject: [PATCH] rhel8/azure: remove and disable firewalld from EAP

Remove firewalld from the base package set for Azure and add it to all
the image-specific package sets except EAP (and explicitly exclude it).
Remove firewalld from the base image config for Azure and add it to all
the image-specific configs.

Test manifests updated.
Manifest changes for non-EAP image types is only the enabled-services
reordering: firewalld is last because it is appended to the base config.

See COMPOSER-1859
---
 internal/distro/rhel8/azure.go                | 112 ++++++-----
 .../manifests/centos_8-aarch64-vhd-boot.json  |   4 +-
 .../manifests/centos_8-x86_64-vhd-boot.json   |   4 +-
 .../rhel_8-aarch64-azure_rhui-boot.json       |   4 +-
 .../manifests/rhel_8-aarch64-vhd-boot.json    |   4 +-
 .../rhel_8-x86_64-azure_eap7_rhui-boot.json   | 190 ------------------
 .../rhel_8-x86_64-azure_rhui-boot.json        |   4 +-
 .../rhel_8-x86_64-azure_sap_rhui-boot.json    |   4 +-
 .../manifests/rhel_8-x86_64-vhd-boot.json     |   4 +-
 .../rhel_84-x86_64-azure_rhui-boot.json       |   4 +-
 .../rhel_84-x86_64-azure_sap_rhui-boot.json   |   4 +-
 .../manifests/rhel_84-x86_64-vhd-boot.json    |   4 +-
 .../rhel_85-x86_64-azure_rhui-boot.json       |   4 +-
 .../rhel_85-x86_64-azure_sap_rhui-boot.json   |   4 +-
 .../manifests/rhel_85-x86_64-vhd-boot.json    |   4 +-
 .../rhel_86-aarch64-azure_rhui-boot.json      |   4 +-
 .../manifests/rhel_86-aarch64-vhd-boot.json   |   4 +-
 .../rhel_86-x86_64-azure_eap7_rhui-boot.json  | 190 ------------------
 .../rhel_86-x86_64-azure_rhui-boot.json       |   4 +-
 .../rhel_86-x86_64-azure_sap_rhui-boot.json   |   4 +-
 .../manifests/rhel_86-x86_64-vhd-boot.json    |   4 +-
 .../rhel_87-aarch64-azure_rhui-boot.json      |   4 +-
 .../manifests/rhel_87-aarch64-vhd-boot.json   |   4 +-
 .../rhel_87-x86_64-azure_eap7_rhui-boot.json  | 190 ------------------
 .../rhel_87-x86_64-azure_rhui-boot.json       |   4 +-
 .../rhel_87-x86_64-azure_sap_rhui-boot.json   |   4 +-
 .../manifests/rhel_87-x86_64-vhd-boot.json    |   4 +-
 .../rhel_88-aarch64-azure_rhui-boot.json      |   4 +-
 .../manifests/rhel_88-aarch64-vhd-boot.json   |   4 +-
 .../rhel_88-x86_64-azure_eap7_rhui-boot.json  | 190 ------------------
 .../rhel_88-x86_64-azure_rhui-boot.json       |   4 +-
 .../rhel_88-x86_64-azure_sap_rhui-boot.json   |   4 +-
 .../manifests/rhel_88-x86_64-vhd-boot.json    |   4 +-
 .../rhel_89-aarch64-azure_rhui-boot.json      |   4 +-
 .../manifests/rhel_89-aarch64-vhd-boot.json   |   4 +-
 .../rhel_89-x86_64-azure_eap7_rhui-boot.json  | 190 ------------------
 .../rhel_89-x86_64-azure_rhui-boot.json       |   4 +-
 .../rhel_89-x86_64-azure_sap_rhui-boot.json   |   4 +-
 .../manifests/rhel_89-x86_64-vhd-boot.json    |   4 +-
 39 files changed, 129 insertions(+), 1065 deletions(-)

diff --git a/internal/distro/rhel8/azure.go b/internal/distro/rhel8/azure.go
index 54602a9c7..f22545195 100644
--- a/internal/distro/rhel8/azure.go
+++ b/internal/distro/rhel8/azure.go
@@ -20,7 +20,7 @@ func azureRhuiImgType() imageType {
 		packageSets: map[string]packageSetFunc{
 			osPkgsKey: azureRhuiPackageSet,
 		},
-		defaultImageConfig:  defaultAzureRhuiImageConfig.InheritFrom(defaultAzureImageConfig),
+		defaultImageConfig:  defaultAzureRhuiImageConfig.InheritFrom(defaultVhdImageConfig()),
 		kernelOptions:       defaultAzureKernelOptions,
 		bootable:            true,
 		defaultSize:         64 * common.GibiByte,
@@ -61,7 +61,7 @@ func azureByosImgType() imageType {
 		packageSets: map[string]packageSetFunc{
 			osPkgsKey: azurePackageSet,
 		},
-		defaultImageConfig:  defaultAzureByosImageConfig.InheritFrom(defaultAzureImageConfig),
+		defaultImageConfig:  defaultAzureByosImageConfig.InheritFrom(defaultVhdImageConfig()),
 		kernelOptions:       defaultAzureKernelOptions,
 		bootable:            true,
 		defaultSize:         4 * common.GibiByte,
@@ -82,7 +82,7 @@ func azureImgType() imageType {
 		packageSets: map[string]packageSetFunc{
 			osPkgsKey: azurePackageSet,
 		},
-		defaultImageConfig:  defaultAzureImageConfig,
+		defaultImageConfig:  defaultVhdImageConfig(),
 		kernelOptions:       defaultAzureKernelOptions,
 		bootable:            true,
 		defaultSize:         4 * common.GibiByte,
@@ -95,50 +95,25 @@ func azureImgType() imageType {
 }
 
 func azureEap7RhuiImgType() imageType {
-	it := azureRhuiImgType()
-	it.name = "azure-eap7-rhui"
-	it.nameAliases = nil // make sure we don't inherit aliases from the base image type
-	it.workload = eapWorkload()
-
-	// shell env vars for EAP
-	wildflyPath := "/opt/rh/eap7/root/usr/share/wildfly"
-	it.defaultImageConfig.ShellInit = []shell.InitFile{
-		{
-			Filename: "eap_env.sh",
-			Variables: []shell.EnvironmentVariable{
-				{
-					Key:   "EAP_HOME",
-					Value: wildflyPath,
-				},
-				{
-					Key:   "JBOSS_HOME",
-					Value: wildflyPath,
-				},
-			},
+	return imageType{
+		name:        "azure-eap7-rhui",
+		workload:    eapWorkload(),
+		filename:    "disk.vhd.xz",
+		mimeType:    "application/xz",
+		compression: "xz",
+		packageSets: map[string]packageSetFunc{
+			osPkgsKey: azureEapPackageSet,
 		},
+		defaultImageConfig:  defaultAzureEapImageConfig.InheritFrom(defaultAzureRhuiImageConfig.InheritFrom(defaultAzureImageConfig)),
+		kernelOptions:       defaultAzureKernelOptions,
+		bootable:            true,
+		defaultSize:         64 * common.GibiByte,
+		image:               liveImage,
+		buildPipelines:      []string{"build"},
+		payloadPipelines:    []string{"os", "image", "vpc", "xz"},
+		exports:             []string{"xz"},
+		basePartitionTables: azureRhuiBasePartitionTables,
 	}
-	it.defaultImageConfig.Firewall = &osbuild.FirewallStageOptions{
-		Ports: []string{
-			"23364:tcp", // modcluster
-			"25:tcp",    // mail
-			"3528:tcp",  // IIOP
-			"3529:tcp",  // IIOP-SSL
-			"45700:tcp", // Clustering subsystem
-			"4712:tcp",  // recovery manager
-			"4713:tcp",  // recovery manager
-			"54200:tcp", // Clustering subsystem
-			"54688:tcp", // Clustering subsystem
-			"55200:tcp", // Clustering subsystem
-			"57600:tcp", // Clustering subsystem
-			"7600:tcp",  // Clustering subsystem
-			"8009:tcp",  // AJP
-			"8080:tcp",  // HTTP
-			"8443:tcp",  // HTTPS
-			"9990:tcp",  // Management interface over HTTP
-			"9993:tcp",  // Management interface over HTTPS
-		},
-	}
-	return it
 }
 
 // PACKAGE SETS
@@ -158,7 +133,6 @@ func azureCommonPackageSet(t *imageType) rpmmd.PackageSet {
 			"dracut-config-generic",
 			"dracut-norescue",
 			"efibootmgr",
-			"firewalld",
 			"gdisk",
 			"hyperv-daemons",
 			"kernel",
@@ -237,6 +211,9 @@ func azureCommonPackageSet(t *imageType) rpmmd.PackageSet {
 // Azure BYOS image package set
 func azurePackageSet(t *imageType) rpmmd.PackageSet {
 	return rpmmd.PackageSet{
+		Include: []string{
+			"firewalld",
+		},
 		Exclude: []string{
 			"alsa-lib",
 		},
@@ -247,6 +224,7 @@ func azurePackageSet(t *imageType) rpmmd.PackageSet {
 func azureRhuiPackageSet(t *imageType) rpmmd.PackageSet {
 	return rpmmd.PackageSet{
 		Include: []string{
+			"firewalld",
 			"rhui-azure-rhel8",
 		},
 		Exclude: []string{
@@ -261,11 +239,20 @@ func azureRhuiPackageSet(t *imageType) rpmmd.PackageSet {
 func azureSapPackageSet(t *imageType) rpmmd.PackageSet {
 	return rpmmd.PackageSet{
 		Include: []string{
+			"firewalld",
 			"rhui-azure-rhel8-sap-ha",
 		},
 	}.Append(azureCommonPackageSet(t)).Append(SapPackageSet(t))
 }
 
+func azureEapPackageSet(t *imageType) rpmmd.PackageSet {
+	return rpmmd.PackageSet{
+		Exclude: []string{
+			"firewalld",
+		},
+	}.Append(azureCommonPackageSet(t))
+}
+
 // PARTITION TABLES
 
 var azureRhuiBasePartitionTables = distro.BasePartitionTableMap{
@@ -503,7 +490,6 @@ var defaultAzureImageConfig = &distro.ImageConfig{
 		},
 	},
 	EnabledServices: []string{
-		"firewalld",
 		"nm-cloud-setup.service",
 		"nm-cloud-setup.timer",
 		"sshd",
@@ -698,6 +684,34 @@ var defaultAzureRhuiImageConfig = &distro.ImageConfig{
 	},
 }
 
-func sapAzureImageConfig(rd distribution) *distro.ImageConfig {
-	return sapImageConfig(rd).InheritFrom(defaultAzureImageConfig)
+const wildflyPath = "/opt/rh/eap7/root/usr/share/wildfly"
+
+var defaultAzureEapImageConfig = &distro.ImageConfig{
+	// shell env vars for EAP
+	ShellInit: []shell.InitFile{
+		{
+			Filename: "eap_env.sh",
+			Variables: []shell.EnvironmentVariable{
+				{
+					Key:   "EAP_HOME",
+					Value: wildflyPath,
+				},
+				{
+					Key:   "JBOSS_HOME",
+					Value: wildflyPath,
+				},
+			},
+		},
+	},
+}
+
+func defaultVhdImageConfig() *distro.ImageConfig {
+	imageConfig := &distro.ImageConfig{
+		EnabledServices: append(defaultAzureImageConfig.EnabledServices, "firewalld"),
+	}
+	return imageConfig.InheritFrom(defaultAzureImageConfig)
+}
+
+func sapAzureImageConfig(rd distribution) *distro.ImageConfig {
+	return sapImageConfig(rd).InheritFrom(defaultVhdImageConfig())
 }
diff --git a/test/data/manifests/centos_8-aarch64-vhd-boot.json b/test/data/manifests/centos_8-aarch64-vhd-boot.json
index 52ccf3918..0aa07b397 100644
--- a/test/data/manifests/centos_8-aarch64-vhd-boot.json
+++ b/test/data/manifests/centos_8-aarch64-vhd-boot.json
@@ -6547,12 +6547,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/centos_8-x86_64-vhd-boot.json b/test/data/manifests/centos_8-x86_64-vhd-boot.json
index 8c531e5d4..81bd8422a 100644
--- a/test/data/manifests/centos_8-x86_64-vhd-boot.json
+++ b/test/data/manifests/centos_8-x86_64-vhd-boot.json
@@ -6676,12 +6676,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_8-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_8-aarch64-azure_rhui-boot.json
index de241aa6a..20ea70406 100644
--- a/test/data/manifests/rhel_8-aarch64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-azure_rhui-boot.json
@@ -2795,12 +2795,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_8-aarch64-vhd-boot.json b/test/data/manifests/rhel_8-aarch64-vhd-boot.json
index 0e2f3f35d..4442248a4 100644
--- a/test/data/manifests/rhel_8-aarch64-vhd-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-vhd-boot.json
@@ -2746,12 +2746,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_8-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_8-x86_64-azure_eap7_rhui-boot.json
index 3ed64cb87..33684e3c0 100644
--- a/test/data/manifests/rhel_8-x86_64-azure_eap7_rhui-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-azure_eap7_rhui-boot.json
@@ -942,12 +942,6 @@
                   {
                     "id": "sha256:ce63708391f77873a344a2ff1ff148be88a5bac39693c9d0bb458f7b3ebd63b9"
                   },
-                  {
-                    "id": "sha256:c52e10db6de5ed833dfb2060921b4e209747db7d2b482034e52baca04db59f8f"
-                  },
-                  {
-                    "id": "sha256:f60b1d583cc9d2a3fa61fd2ed576cc22e1494f1cdb2a0eb6552b6b4e0b10194d"
-                  },
                   {
                     "id": "sha256:7f2a8ed367bbe341e4c7570746cdeada3b68f6d1e498b411748b972190bce95c"
                   },
@@ -1083,18 +1077,9 @@
                   {
                     "id": "sha256:13efcd2defaca16875c6606d923440612d664fb6733979ab1d01a6d02bed9edd"
                   },
-                  {
-                    "id": "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae"
-                  },
-                  {
-                    "id": "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7"
-                  },
                   {
                     "id": "sha256:cadee8f05630b81adc4c4ffb82359a28b5201ff31e0ab590645c190c2ae1149a"
                   },
-                  {
-                    "id": "sha256:429fa2b6cbe901b802e2acf8ed1b6005ff3b16d28915db6674b0621d9d8da657"
-                  },
                   {
                     "id": "sha256:471930ec9d0e115809eaae8aa5c888bc07104c600ff49b55ab746701691c7c0d"
                   },
@@ -1608,9 +1593,6 @@
                   {
                     "id": "sha256:eb9b37827f1851c8a2683cd86026fda90847afe90d51ea746d7cd5f49f6f90d1"
                   },
-                  {
-                    "id": "sha256:442e58693d7a5a0ac84e35faa5ae86c2588ae7467918947de118ade0d0673ab8"
-                  },
                   {
                     "id": "sha256:4f3c2518a3a02e4cec426928f8e5b28d9318af2b1aeaf7fc77f9d4a313f09740"
                   },
@@ -1767,9 +1749,6 @@
                   {
                     "id": "sha256:7540cda72b29722509f43e724c6095db62b8f080064ab4d1eccf39537e458c97"
                   },
-                  {
-                    "id": "sha256:aa45417d26f9cc35fff19c4d547e7c8eaabfbc72667d716d5b604982e2d704f2"
-                  },
                   {
                     "id": "sha256:86d305a1466a596f8b436561d674f2510f268bed9e73f56c87da1dd120f99c18"
                   },
@@ -1821,9 +1800,6 @@
                   {
                     "id": "sha256:b4169eded939e7c596da378f94776255a86790ded4cf749e3b62ce809040f183"
                   },
-                  {
-                    "id": "sha256:66ea1e3d0bfb3d08a0383cec05f9d51b598ad5fbc528fb980f38688bb7ede8ed"
-                  },
                   {
                     "id": "sha256:3446bbd5d26c3a1b8cd64c077ae4bbeea8ef2ef349c590297bbe2a53e18ce9e6"
                   },
@@ -1869,12 +1845,6 @@
                   {
                     "id": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
                   },
-                  {
-                    "id": "sha256:5293624aaec9da3557c32d1c0792a4ec6b2db1a63b77ac2ef3cb283da15490e9"
-                  },
-                  {
-                    "id": "sha256:40c199fa3a31697ae9aa7a2ee1c37539faf7be0fbc81a6216332c77c99927b5c"
-                  },
                   {
                     "id": "sha256:db3e2f66d04da2a8646171421a55af9675cdd22747a7f43777fc8b1fb588ab5e"
                   },
@@ -2574,9 +2544,6 @@
                   {
                     "id": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
                   },
-                  {
-                    "id": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
-                  },
                   {
                     "id": "sha256:ca3e0ec3842accbc0b801561a716708261f7fac32fcccaa6bf70bd862739aa67",
                     "options": {
@@ -5638,30 +5605,6 @@
               "zone": "Etc/UTC"
             }
           },
-          {
-            "type": "org.osbuild.firewall",
-            "options": {
-              "ports": [
-                "23364:tcp",
-                "25:tcp",
-                "3528:tcp",
-                "3529:tcp",
-                "45700:tcp",
-                "4712:tcp",
-                "4713:tcp",
-                "54200:tcp",
-                "54688:tcp",
-                "55200:tcp",
-                "57600:tcp",
-                "7600:tcp",
-                "8009:tcp",
-                "8080:tcp",
-                "8443:tcp",
-                "9990:tcp",
-                "9993:tcp"
-              ]
-            }
-          },
           {
             "type": "org.osbuild.sysconfig",
             "options": {
@@ -5959,7 +5902,6 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
@@ -7027,9 +6969,6 @@
           "sha256:331b405a0b2b4bf93534af445da72d35eb1acd9ce66bd2d84f8ae5b169097d24": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-hibernate-search-engine-5.10.7-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-rhui-azure-20230418/Packages/r/rhui-azure-rhel8-2.2-484.noarch.rpm"
-          },
           "sha256:336ed0cd6b743583edda90cb5730ca407721f6336b8d5eeca7d25981fcb4b28c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/sudo-1.8.29-8.el8.x86_64.rpm"
           },
@@ -7147,9 +7086,6 @@
           "sha256:3d6a5eeb0da36ce36cd6ddc5e3c2d2bc36cd5962d1450077c5c5754b8f5ac02c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glib2-2.56.4-159.el8.x86_64.rpm"
           },
-          "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ipset-libs-7.1-1.el8.x86_64.rpm"
-          },
           "sha256:3db2de8520dfeb4ba9c6bfa692b979e5de98c2c4149b998591292db68fadea3d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-resteasy-client-3.15.4-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -7189,9 +7125,6 @@
           "sha256:40764300711f086a034db7736c9e987ae1b60d2689ff2ec9aab1884113b35110": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-glassfish-jsf-2.3.14-6.SP07_redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:40c199fa3a31697ae9aa7a2ee1c37539faf7be0fbc81a6216332c77c99927b5c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-slip-dbus-0.6.4-13.el8.noarch.rpm"
-          },
           "sha256:40e20c28cc28db273a7e08a9351fb52224a9d46d8b178cee6fedb6487f47785c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-resteasy-atom-provider-3.15.4-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -7204,9 +7137,6 @@
           "sha256:4229196b5ea88c1133d5509a2ec326093a2c7ac5566ca4abb55c3d6fab47130a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-gobject-3.28.3-2.el8.x86_64.rpm"
           },
-          "sha256:429fa2b6cbe901b802e2acf8ed1b6005ff3b16d28915db6674b0621d9d8da657": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/iptables-ebtables-1.8.4-23.el8.x86_64.rpm"
-          },
           "sha256:42b2221eb7118f2a10bbe67ba22e6876cdad05f9db6ae0e057d556041555dc7f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-pyasn1-0.3.7-6.el8.noarch.rpm"
           },
@@ -7216,9 +7146,6 @@
           "sha256:441c3514b1526c53e2f71cf5546c67df7c2a48b3231cc13fdb99fed530ebc7ec": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-stax-ex-1.8.3-2.redhat_00002.1.el8eap.noarch.rpm"
           },
-          "sha256:442e58693d7a5a0ac84e35faa5ae86c2588ae7467918947de118ade0d0673ab8": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/nftables-0.9.3-26.el8.x86_64.rpm"
-          },
           "sha256:44b730f4e2e8ecec7e15627050f8baf4910c66ba8caeb40c874f5011c9a23b30": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-wildfly-http-ejb-client-1.1.13-1.SP1_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -7426,9 +7353,6 @@
           "sha256:5249276af28b8abe2c2f6782aba5cf7793fff19faa2ad124b0bfed7e1ea0eb98": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/quota-4.04-14.el8.x86_64.rpm"
           },
-          "sha256:5293624aaec9da3557c32d1c0792a4ec6b2db1a63b77ac2ef3cb283da15490e9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-slip-0.6.4-13.el8.noarch.rpm"
-          },
           "sha256:5348506e9fa17558bae75af2fc38f1cf663101b7a33a7c0139954473c94c7b3a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/kernel-4.18.0-425.3.1.el8.x86_64.rpm"
           },
@@ -7639,9 +7563,6 @@
           "sha256:6604ce621bb3dad2635a880c85373dcbd70ef7aac336eaa8ef468b2809ad7aba": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-json-patch-1.9.0-1.redhat_00002.1.el8eap.noarch.rpm"
           },
-          "sha256:66ea1e3d0bfb3d08a0383cec05f9d51b598ad5fbc528fb980f38688bb7ede8ed": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-nftables-0.9.3-26.el8.x86_64.rpm"
-          },
           "sha256:66f2b8c95fe5ccb425ed30188476a6fbabf9bed4f6aa8febe6a0825efd34b490": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-netty-buffer-4.1.77-3.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -8479,9 +8400,6 @@
           "sha256:aa37a6221176cf80572b349c56a8320089cb4cf9ad452f88c5337ddf27ef6ab8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/cups-libs-2.2.6-50.el8.x86_64.rpm"
           },
-          "sha256:aa45417d26f9cc35fff19c4d547e7c8eaabfbc72667d716d5b604982e2d704f2": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-firewall-0.9.3-13.el8.noarch.rpm"
-          },
           "sha256:ab84e6fc9ce10d440b7b0720a4c92e4562d710d620e01ac30706b9b4ce186c76": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-bouncycastle-pkix-1.68.0-2.redhat_00005.1.el8eap.noarch.rpm"
           },
@@ -8737,9 +8655,6 @@
           "sha256:c112d94ff1596ed32b70d70f17fc02ad6b3265ac2083c2be1608afcf3b60ff03": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libnftnl-1.1.5-5.el8.x86_64.rpm"
           },
-          "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ipset-7.1-1.el8.x86_64.rpm"
-          },
           "sha256:c1c683a37f4cdf4ed85f3bf60f6bec3bad9cc5be68f896cdd509c0c09f3dac4a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-lucene-core-5.5.5-3.redhat_2.1.el8eap.noarch.rpm"
           },
@@ -8797,9 +8712,6 @@
           "sha256:c504e02ff8af5607b7b23bcdceee78f728ab16a9adc053bd774739d520d95ecb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/pcre2-10.32-3.el8_6.x86_64.rpm"
           },
-          "sha256:c52e10db6de5ed833dfb2060921b4e209747db7d2b482034e52baca04db59f8f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/firewalld-0.9.3-13.el8.noarch.rpm"
-          },
           "sha256:c5d0c9a5acc6c2de5e52b38701d6cad5cc37d22c1cb518ca8bcac79bddffaaba": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libappstream-glib-0.7.14-3.el8.x86_64.rpm"
           },
@@ -9391,9 +9303,6 @@
           "sha256:f60a876a1786b73dd9b8c39078a5b9bf543d3c1200c6cc46186b4aeedf81b2b1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-httpcomponents-client-4.5.13-1.redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:f60b1d583cc9d2a3fa61fd2ed576cc22e1494f1cdb2a0eb6552b6b4e0b10194d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/firewalld-filesystem-0.9.3-13.el8.noarch.rpm"
-          },
           "sha256:f67e4d60d0cbef8258a722297597d1cd71b4fda24544cf8ba7c64914592bb51f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-joda-time-2.9.7-2.redhat_1.1.el8eap.noarch.rpm"
           },
@@ -12117,24 +12026,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/findutils-4.6.0-20.el8.x86_64.rpm",
         "checksum": "sha256:ce63708391f77873a344a2ff1ff148be88a5bac39693c9d0bb458f7b3ebd63b9"
       },
-      {
-        "name": "firewalld",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/firewalld-0.9.3-13.el8.noarch.rpm",
-        "checksum": "sha256:c52e10db6de5ed833dfb2060921b4e209747db7d2b482034e52baca04db59f8f"
-      },
-      {
-        "name": "firewalld-filesystem",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/firewalld-filesystem-0.9.3-13.el8.noarch.rpm",
-        "checksum": "sha256:f60b1d583cc9d2a3fa61fd2ed576cc22e1494f1cdb2a0eb6552b6b4e0b10194d"
-      },
       {
         "name": "fontconfig",
         "epoch": 0,
@@ -12540,24 +12431,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/iproute-5.18.0-1.el8.x86_64.rpm",
         "checksum": "sha256:13efcd2defaca16875c6606d923440612d664fb6733979ab1d01a6d02bed9edd"
       },
-      {
-        "name": "ipset",
-        "epoch": 0,
-        "version": "7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ipset-7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae"
-      },
-      {
-        "name": "ipset-libs",
-        "epoch": 0,
-        "version": "7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ipset-libs-7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7"
-      },
       {
         "name": "iptables",
         "epoch": 0,
@@ -12567,15 +12440,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/iptables-1.8.4-23.el8.x86_64.rpm",
         "checksum": "sha256:cadee8f05630b81adc4c4ffb82359a28b5201ff31e0ab590645c190c2ae1149a"
       },
-      {
-        "name": "iptables-ebtables",
-        "epoch": 0,
-        "version": "1.8.4",
-        "release": "23.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/iptables-ebtables-1.8.4-23.el8.x86_64.rpm",
-        "checksum": "sha256:429fa2b6cbe901b802e2acf8ed1b6005ff3b16d28915db6674b0621d9d8da657"
-      },
       {
         "name": "iptables-libs",
         "epoch": 0,
@@ -14115,15 +13979,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/newt-0.52.20-11.el8.x86_64.rpm",
         "checksum": "sha256:eb9b37827f1851c8a2683cd86026fda90847afe90d51ea746d7cd5f49f6f90d1"
       },
-      {
-        "name": "nftables",
-        "epoch": 1,
-        "version": "0.9.3",
-        "release": "26.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/nftables-0.9.3-26.el8.x86_64.rpm",
-        "checksum": "sha256:442e58693d7a5a0ac84e35faa5ae86c2588ae7467918947de118ade0d0673ab8"
-      },
       {
         "name": "npth",
         "epoch": 0,
@@ -14592,15 +14447,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-ethtool-0.14-5.el8.x86_64.rpm",
         "checksum": "sha256:7540cda72b29722509f43e724c6095db62b8f080064ab4d1eccf39537e458c97"
       },
-      {
-        "name": "python3-firewall",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-firewall-0.9.3-13.el8.noarch.rpm",
-        "checksum": "sha256:aa45417d26f9cc35fff19c4d547e7c8eaabfbc72667d716d5b604982e2d704f2"
-      },
       {
         "name": "python3-gobject-base",
         "epoch": 0,
@@ -14754,15 +14600,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-magic-5.33-21.el8.noarch.rpm",
         "checksum": "sha256:b4169eded939e7c596da378f94776255a86790ded4cf749e3b62ce809040f183"
       },
-      {
-        "name": "python3-nftables",
-        "epoch": 1,
-        "version": "0.9.3",
-        "release": "26.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-nftables-0.9.3-26.el8.x86_64.rpm",
-        "checksum": "sha256:66ea1e3d0bfb3d08a0383cec05f9d51b598ad5fbc528fb980f38688bb7ede8ed"
-      },
       {
         "name": "python3-oauthlib",
         "epoch": 0,
@@ -14898,24 +14735,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-six-1.11.0-8.el8.noarch.rpm",
         "checksum": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
       },
-      {
-        "name": "python3-slip",
-        "epoch": 0,
-        "version": "0.6.4",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-slip-0.6.4-13.el8.noarch.rpm",
-        "checksum": "sha256:5293624aaec9da3557c32d1c0792a4ec6b2db1a63b77ac2ef3cb283da15490e9"
-      },
-      {
-        "name": "python3-slip-dbus",
-        "epoch": 0,
-        "version": "0.6.4",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-slip-dbus-0.6.4-13.el8.noarch.rpm",
-        "checksum": "sha256:40c199fa3a31697ae9aa7a2ee1c37539faf7be0fbc81a6216332c77c99927b5c"
-      },
       {
         "name": "python3-sssdconfig",
         "epoch": 0,
@@ -17013,15 +16832,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/xorg-x11-fonts-Type1-7.5-19.el8.noarch.rpm",
         "checksum": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
       },
-      {
-        "name": "rhui-azure-rhel8",
-        "epoch": 0,
-        "version": "2.2",
-        "release": "484",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-rhui-azure-20230418/Packages/r/rhui-azure-rhel8-2.2-484.noarch.rpm",
-        "checksum": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
-      },
       {
         "name": "eap7-FastInfoset",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json
index 112bf06fe..35e7346f6 100644
--- a/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json
@@ -2848,12 +2848,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_8-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_8-x86_64-azure_sap_rhui-boot.json
index af4b99633..67310caf1 100644
--- a/test/data/manifests/rhel_8-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-azure_sap_rhui-boot.json
@@ -3506,12 +3506,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_8-x86_64-vhd-boot.json b/test/data/manifests/rhel_8-x86_64-vhd-boot.json
index b539a2ba7..0f3f340bc 100644
--- a/test/data/manifests/rhel_8-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-vhd-boot.json
@@ -2798,12 +2798,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json
index f8958c73a..1845bcf35 100644
--- a/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json
@@ -2880,12 +2880,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json
index cfad5ceb1..dc3e1b4af 100644
--- a/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-azure_sap_rhui-boot.json
@@ -3499,12 +3499,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_84-x86_64-vhd-boot.json b/test/data/manifests/rhel_84-x86_64-vhd-boot.json
index 60d2d91cc..a7b0464a0 100644
--- a/test/data/manifests/rhel_84-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-vhd-boot.json
@@ -2831,12 +2831,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json
index 20cd5e0c6..4596821d2 100644
--- a/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json
@@ -2853,12 +2853,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json
index d7ac7ae23..273d4c17b 100644
--- a/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-azure_sap_rhui-boot.json
@@ -3475,12 +3475,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_85-x86_64-vhd-boot.json b/test/data/manifests/rhel_85-x86_64-vhd-boot.json
index aa5d6f0b3..1ee62d7cc 100644
--- a/test/data/manifests/rhel_85-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-vhd-boot.json
@@ -2804,12 +2804,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_86-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_86-aarch64-azure_rhui-boot.json
index 18ae938ec..88cb55b77 100644
--- a/test/data/manifests/rhel_86-aarch64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-azure_rhui-boot.json
@@ -2798,12 +2798,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_86-aarch64-vhd-boot.json b/test/data/manifests/rhel_86-aarch64-vhd-boot.json
index b3a927f35..3b0805ee8 100644
--- a/test/data/manifests/rhel_86-aarch64-vhd-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-vhd-boot.json
@@ -2749,12 +2749,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_86-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-azure_eap7_rhui-boot.json
index 78a895602..62f55b76a 100644
--- a/test/data/manifests/rhel_86-x86_64-azure_eap7_rhui-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-azure_eap7_rhui-boot.json
@@ -942,12 +942,6 @@
                   {
                     "id": "sha256:ce63708391f77873a344a2ff1ff148be88a5bac39693c9d0bb458f7b3ebd63b9"
                   },
-                  {
-                    "id": "sha256:8fc3ad5da21ae091841aa3d0b83e7a810f8ced5b8b39e46ed74c6695d11036f9"
-                  },
-                  {
-                    "id": "sha256:4b65b967f3bb1f46a7197b7ec1cf69c2980afd5d299a8927822b699312dd727f"
-                  },
                   {
                     "id": "sha256:7f2a8ed367bbe341e4c7570746cdeada3b68f6d1e498b411748b972190bce95c"
                   },
@@ -1080,18 +1074,9 @@
                   {
                     "id": "sha256:17c1fcfda1c7367e5bddeafa29193379ce8712958d4b735e2227e7a07950e858"
                   },
-                  {
-                    "id": "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae"
-                  },
-                  {
-                    "id": "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7"
-                  },
                   {
                     "id": "sha256:3245158fd6bdfeba1ef9f402b5ea509e99e909bddb79e9a283fefa59d6392c67"
                   },
-                  {
-                    "id": "sha256:72384e5b49843827a64dd83881e381be7a7df4e4bb95a6ebd075dd37b74b380b"
-                  },
                   {
                     "id": "sha256:c501f1c985a8d0cb43ca89a4f2759f904b24f6147c607a99cc0b235932af59fc"
                   },
@@ -1605,9 +1590,6 @@
                   {
                     "id": "sha256:eb9b37827f1851c8a2683cd86026fda90847afe90d51ea746d7cd5f49f6f90d1"
                   },
-                  {
-                    "id": "sha256:abf7177d0911e70675875987ec0ef8d5f594da4cba4addf76ba9f5aff4a194d6"
-                  },
                   {
                     "id": "sha256:4f3c2518a3a02e4cec426928f8e5b28d9318af2b1aeaf7fc77f9d4a313f09740"
                   },
@@ -1767,9 +1749,6 @@
                   {
                     "id": "sha256:224388a69a7ab8f379b42c09106fb398d77f7e7077c3f1e9680452d746d755fe"
                   },
-                  {
-                    "id": "sha256:ad49ef3c8c1e3bf2f8ec04b22a7778074550087ec5ba6068f0783b8d10f45382"
-                  },
                   {
                     "id": "sha256:86d305a1466a596f8b436561d674f2510f268bed9e73f56c87da1dd120f99c18"
                   },
@@ -1821,9 +1800,6 @@
                   {
                     "id": "sha256:6ac86e716545bfde2c56ca9632aa35d211386a94251aecd44749f3998dbe4732"
                   },
-                  {
-                    "id": "sha256:d759703d633257a88457c38d94b9a7836e0ec8eeb72df385df348423e668ae08"
-                  },
                   {
                     "id": "sha256:3446bbd5d26c3a1b8cd64c077ae4bbeea8ef2ef349c590297bbe2a53e18ce9e6"
                   },
@@ -1869,12 +1845,6 @@
                   {
                     "id": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
                   },
-                  {
-                    "id": "sha256:7f2436df92ce3dacaf5a52d988e65b2cbfc6af8be917bdc14119940480efd7bb"
-                  },
-                  {
-                    "id": "sha256:96b090a6696ca4c8b3f701c3a7b95b91c892db389e023c4b2d500a5162e43e8d"
-                  },
                   {
                     "id": "sha256:bf56b380578d1392bae4441bab707395fc7f6a76bf41b7408c5ab4eb8f8501bf"
                   },
@@ -2580,9 +2550,6 @@
                   {
                     "id": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
                   },
-                  {
-                    "id": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
-                  },
                   {
                     "id": "sha256:ca3e0ec3842accbc0b801561a716708261f7fac32fcccaa6bf70bd862739aa67",
                     "options": {
@@ -5644,30 +5611,6 @@
               "zone": "Etc/UTC"
             }
           },
-          {
-            "type": "org.osbuild.firewall",
-            "options": {
-              "ports": [
-                "23364:tcp",
-                "25:tcp",
-                "3528:tcp",
-                "3529:tcp",
-                "45700:tcp",
-                "4712:tcp",
-                "4713:tcp",
-                "54200:tcp",
-                "54688:tcp",
-                "55200:tcp",
-                "57600:tcp",
-                "7600:tcp",
-                "8009:tcp",
-                "8080:tcp",
-                "8443:tcp",
-                "9990:tcp",
-                "9993:tcp"
-              ]
-            }
-          },
           {
             "type": "org.osbuild.sysconfig",
             "options": {
@@ -5965,7 +5908,6 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
@@ -7093,9 +7035,6 @@
           "sha256:333f6871ae18253546f50fea5dcb97635da5ee74b2c109911a605ddd50c9226c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libcap-2.26-5.el8.x86_64.rpm"
           },
-          "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-rhui-azure-20230418/Packages/r/rhui-azure-rhel8-2.2-484.noarch.rpm"
-          },
           "sha256:336ed0cd6b743583edda90cb5730ca407721f6336b8d5eeca7d25981fcb4b28c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/sudo-1.8.29-8.el8.x86_64.rpm"
           },
@@ -7198,9 +7137,6 @@
           "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
           },
-          "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/ipset-libs-7.1-1.el8.x86_64.rpm"
-          },
           "sha256:3db2de8520dfeb4ba9c6bfa692b979e5de98c2c4149b998591292db68fadea3d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-resteasy-client-3.15.4-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -7408,9 +7344,6 @@
           "sha256:4b378473dcb90726a2ee6c369e8edf07d56f6031f19b97cc0c0ea1b9bda25d88": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-narayana-txframework-5.11.4-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:4b65b967f3bb1f46a7197b7ec1cf69c2980afd5d299a8927822b699312dd727f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/firewalld-filesystem-0.9.3-11.el8.noarch.rpm"
-          },
           "sha256:4ba395fa52087932606da98e076eb94b8d766ee11d0a60bc09bc8bd57ff6e479": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/man-db-2.7.6.1-18.el8.x86_64.rpm"
           },
@@ -7813,9 +7746,6 @@
           "sha256:722e1e1317db290df598224958cc3b6a1b784a8acb678b33b676f7119bbee028": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-netty-codec-mqtt-4.1.77-3.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:72384e5b49843827a64dd83881e381be7a7df4e4bb95a6ebd075dd37b74b380b": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/iptables-ebtables-1.8.4-22.el8.x86_64.rpm"
-          },
           "sha256:723963983258ad5c85fc708c519361f4668db7703f8dbfeae6901c1459bd1010": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/bind-export-libs-9.11.36-2.el8.x86_64.rpm"
           },
@@ -7972,9 +7902,6 @@
           "sha256:7ebd6b189663e2ec911e153f2246221737e25978ef88d6b0595a486ca58a31a5": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nss-sysinit-3.67.0-7.el8_5.x86_64.rpm"
           },
-          "sha256:7f2436df92ce3dacaf5a52d988e65b2cbfc6af8be917bdc14119940480efd7bb": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-slip-0.6.4-11.el8.noarch.rpm"
-          },
           "sha256:7f2a8ed367bbe341e4c7570746cdeada3b68f6d1e498b411748b972190bce95c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/fontconfig-2.13.1-4.el8.x86_64.rpm"
           },
@@ -8149,9 +8076,6 @@
           "sha256:8f7f241a9532a42957e76c711f2ebb0af1c2359fd02b7820c792a81ea4d96261": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/nmap-ncat-7.70-6.el8.x86_64.rpm"
           },
-          "sha256:8fc3ad5da21ae091841aa3d0b83e7a810f8ced5b8b39e46ed74c6695d11036f9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/firewalld-0.9.3-11.el8.noarch.rpm"
-          },
           "sha256:8fc8dbbae0872390506b6695b64518fe75f19cb296a2b921277124fe64d21d4e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-resteasy-jackson2-provider-3.15.4-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -8245,9 +8169,6 @@
           "sha256:966566770c97b65d5c2d743631322241fc8508f56c2698fc706bd7dba3761199": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/xorg-x11-font-utils-7.5-41.el8.x86_64.rpm"
           },
-          "sha256:96b090a6696ca4c8b3f701c3a7b95b91c892db389e023c4b2d500a5162e43e8d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-slip-dbus-0.6.4-11.el8.noarch.rpm"
-          },
           "sha256:96fadfed6a8225a89b331e7b62ed8ee74b393cea1520fa0d89f6f0dc1a458fb3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libpkgconf-1.4.2-1.el8.x86_64.rpm"
           },
@@ -8503,9 +8424,6 @@
           "sha256:ab8fa40b6787978edb5de35df49ba0d1a687f9bd971c127520d7b7f8f99f4508": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libconfig-1.5-9.el8.x86_64.rpm"
           },
-          "sha256:abf7177d0911e70675875987ec0ef8d5f594da4cba4addf76ba9f5aff4a194d6": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/nftables-0.9.3-24.el8.x86_64.rpm"
-          },
           "sha256:ac2800369b7f4dc05a8fec452eabedf02f153c11e188a1e80157e35592305690": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libnl3-cli-3.5.0-1.el8.x86_64.rpm"
           },
@@ -8527,9 +8445,6 @@
           "sha256:ad060f60303b6764e08657436147cc24cfc4bb1ccc1431796407ba005a7bcec0": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/rootfiles-8.1-22.el8.noarch.rpm"
           },
-          "sha256:ad49ef3c8c1e3bf2f8ec04b22a7778074550087ec5ba6068f0783b8d10f45382": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-firewall-0.9.3-11.el8.noarch.rpm"
-          },
           "sha256:adb609ee93db65bcb8e4e9ee1afa3456744fe3c0f8fc2565d22e02b8f1d63bfc": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/giflib-5.1.4-3.el8.x86_64.rpm"
           },
@@ -8788,9 +8703,6 @@
           "sha256:c112d94ff1596ed32b70d70f17fc02ad6b3265ac2083c2be1608afcf3b60ff03": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/libnftnl-1.1.5-5.el8.x86_64.rpm"
           },
-          "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/ipset-7.1-1.el8.x86_64.rpm"
-          },
           "sha256:c1c683a37f4cdf4ed85f3bf60f6bec3bad9cc5be68f896cdd509c0c09f3dac4a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-lucene-core-5.5.5-3.redhat_2.1.el8eap.noarch.rpm"
           },
@@ -9067,9 +8979,6 @@
           "sha256:d7459121c812740f24d19cc090520bed65dc8acce15de8d0b44b9a1e8a7cfe4c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-wss4j-policy-2.2.7-1.redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:d759703d633257a88457c38d94b9a7836e0ec8eeb72df385df348423e668ae08": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-nftables-0.9.3-24.el8.x86_64.rpm"
-          },
           "sha256:d76c0920b9c2cb7399988e185b68df0887cc0252c79b62be7be3355556a45b30": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/strace-5.13-3.el8.x86_64.rpm"
           },
@@ -12129,24 +12038,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/findutils-4.6.0-20.el8.x86_64.rpm",
         "checksum": "sha256:ce63708391f77873a344a2ff1ff148be88a5bac39693c9d0bb458f7b3ebd63b9"
       },
-      {
-        "name": "firewalld",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "11.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/firewalld-0.9.3-11.el8.noarch.rpm",
-        "checksum": "sha256:8fc3ad5da21ae091841aa3d0b83e7a810f8ced5b8b39e46ed74c6695d11036f9"
-      },
-      {
-        "name": "firewalld-filesystem",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "11.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/firewalld-filesystem-0.9.3-11.el8.noarch.rpm",
-        "checksum": "sha256:4b65b967f3bb1f46a7197b7ec1cf69c2980afd5d299a8927822b699312dd727f"
-      },
       {
         "name": "fontconfig",
         "epoch": 0,
@@ -12543,24 +12434,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/iproute-5.15.0-2.el8.x86_64.rpm",
         "checksum": "sha256:17c1fcfda1c7367e5bddeafa29193379ce8712958d4b735e2227e7a07950e858"
       },
-      {
-        "name": "ipset",
-        "epoch": 0,
-        "version": "7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/ipset-7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae"
-      },
-      {
-        "name": "ipset-libs",
-        "epoch": 0,
-        "version": "7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/ipset-libs-7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7"
-      },
       {
         "name": "iptables",
         "epoch": 0,
@@ -12570,15 +12443,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/iptables-1.8.4-22.el8.x86_64.rpm",
         "checksum": "sha256:3245158fd6bdfeba1ef9f402b5ea509e99e909bddb79e9a283fefa59d6392c67"
       },
-      {
-        "name": "iptables-ebtables",
-        "epoch": 0,
-        "version": "1.8.4",
-        "release": "22.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/iptables-ebtables-1.8.4-22.el8.x86_64.rpm",
-        "checksum": "sha256:72384e5b49843827a64dd83881e381be7a7df4e4bb95a6ebd075dd37b74b380b"
-      },
       {
         "name": "iptables-libs",
         "epoch": 0,
@@ -14118,15 +13982,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/newt-0.52.20-11.el8.x86_64.rpm",
         "checksum": "sha256:eb9b37827f1851c8a2683cd86026fda90847afe90d51ea746d7cd5f49f6f90d1"
       },
-      {
-        "name": "nftables",
-        "epoch": 1,
-        "version": "0.9.3",
-        "release": "24.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/nftables-0.9.3-24.el8.x86_64.rpm",
-        "checksum": "sha256:abf7177d0911e70675875987ec0ef8d5f594da4cba4addf76ba9f5aff4a194d6"
-      },
       {
         "name": "npth",
         "epoch": 0,
@@ -14604,15 +14459,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-ethtool-0.14-4.el8.x86_64.rpm",
         "checksum": "sha256:224388a69a7ab8f379b42c09106fb398d77f7e7077c3f1e9680452d746d755fe"
       },
-      {
-        "name": "python3-firewall",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "11.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-firewall-0.9.3-11.el8.noarch.rpm",
-        "checksum": "sha256:ad49ef3c8c1e3bf2f8ec04b22a7778074550087ec5ba6068f0783b8d10f45382"
-      },
       {
         "name": "python3-gobject-base",
         "epoch": 0,
@@ -14766,15 +14612,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-magic-5.33-20.el8.noarch.rpm",
         "checksum": "sha256:6ac86e716545bfde2c56ca9632aa35d211386a94251aecd44749f3998dbe4732"
       },
-      {
-        "name": "python3-nftables",
-        "epoch": 1,
-        "version": "0.9.3",
-        "release": "24.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-nftables-0.9.3-24.el8.x86_64.rpm",
-        "checksum": "sha256:d759703d633257a88457c38d94b9a7836e0ec8eeb72df385df348423e668ae08"
-      },
       {
         "name": "python3-oauthlib",
         "epoch": 0,
@@ -14910,24 +14747,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-six-1.11.0-8.el8.noarch.rpm",
         "checksum": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
       },
-      {
-        "name": "python3-slip",
-        "epoch": 0,
-        "version": "0.6.4",
-        "release": "11.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-slip-0.6.4-11.el8.noarch.rpm",
-        "checksum": "sha256:7f2436df92ce3dacaf5a52d988e65b2cbfc6af8be917bdc14119940480efd7bb"
-      },
-      {
-        "name": "python3-slip-dbus",
-        "epoch": 0,
-        "version": "0.6.4",
-        "release": "11.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.6-20220201/Packages/python3-slip-dbus-0.6.4-11.el8.noarch.rpm",
-        "checksum": "sha256:96b090a6696ca4c8b3f701c3a7b95b91c892db389e023c4b2d500a5162e43e8d"
-      },
       {
         "name": "python3-sssdconfig",
         "epoch": 0,
@@ -17043,15 +16862,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.6-20220201/Packages/xorg-x11-fonts-Type1-7.5-19.el8.noarch.rpm",
         "checksum": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
       },
-      {
-        "name": "rhui-azure-rhel8",
-        "epoch": 0,
-        "version": "2.2",
-        "release": "484",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-rhui-azure-20230418/Packages/r/rhui-azure-rhel8-2.2-484.noarch.rpm",
-        "checksum": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
-      },
       {
         "name": "eap7-FastInfoset",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json
index 8ecf75ac1..22b87c736 100644
--- a/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json
@@ -2851,12 +2851,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json
index 7718c50c4..f6be6ef2d 100644
--- a/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-azure_sap_rhui-boot.json
@@ -3547,12 +3547,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_86-x86_64-vhd-boot.json b/test/data/manifests/rhel_86-x86_64-vhd-boot.json
index f1da9a799..73c2cbde2 100644
--- a/test/data/manifests/rhel_86-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-vhd-boot.json
@@ -2801,12 +2801,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_87-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_87-aarch64-azure_rhui-boot.json
index fe61b6599..d95f8158e 100644
--- a/test/data/manifests/rhel_87-aarch64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-azure_rhui-boot.json
@@ -2795,12 +2795,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_87-aarch64-vhd-boot.json b/test/data/manifests/rhel_87-aarch64-vhd-boot.json
index f840640c0..0288ba05f 100644
--- a/test/data/manifests/rhel_87-aarch64-vhd-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-vhd-boot.json
@@ -2746,12 +2746,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_87-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-azure_eap7_rhui-boot.json
index a551de13b..e9635a3f7 100644
--- a/test/data/manifests/rhel_87-x86_64-azure_eap7_rhui-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-azure_eap7_rhui-boot.json
@@ -942,12 +942,6 @@
                   {
                     "id": "sha256:ce63708391f77873a344a2ff1ff148be88a5bac39693c9d0bb458f7b3ebd63b9"
                   },
-                  {
-                    "id": "sha256:c52e10db6de5ed833dfb2060921b4e209747db7d2b482034e52baca04db59f8f"
-                  },
-                  {
-                    "id": "sha256:f60b1d583cc9d2a3fa61fd2ed576cc22e1494f1cdb2a0eb6552b6b4e0b10194d"
-                  },
                   {
                     "id": "sha256:7f2a8ed367bbe341e4c7570746cdeada3b68f6d1e498b411748b972190bce95c"
                   },
@@ -1083,18 +1077,9 @@
                   {
                     "id": "sha256:13efcd2defaca16875c6606d923440612d664fb6733979ab1d01a6d02bed9edd"
                   },
-                  {
-                    "id": "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae"
-                  },
-                  {
-                    "id": "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7"
-                  },
                   {
                     "id": "sha256:cadee8f05630b81adc4c4ffb82359a28b5201ff31e0ab590645c190c2ae1149a"
                   },
-                  {
-                    "id": "sha256:429fa2b6cbe901b802e2acf8ed1b6005ff3b16d28915db6674b0621d9d8da657"
-                  },
                   {
                     "id": "sha256:471930ec9d0e115809eaae8aa5c888bc07104c600ff49b55ab746701691c7c0d"
                   },
@@ -1608,9 +1593,6 @@
                   {
                     "id": "sha256:eb9b37827f1851c8a2683cd86026fda90847afe90d51ea746d7cd5f49f6f90d1"
                   },
-                  {
-                    "id": "sha256:442e58693d7a5a0ac84e35faa5ae86c2588ae7467918947de118ade0d0673ab8"
-                  },
                   {
                     "id": "sha256:4f3c2518a3a02e4cec426928f8e5b28d9318af2b1aeaf7fc77f9d4a313f09740"
                   },
@@ -1767,9 +1749,6 @@
                   {
                     "id": "sha256:7540cda72b29722509f43e724c6095db62b8f080064ab4d1eccf39537e458c97"
                   },
-                  {
-                    "id": "sha256:aa45417d26f9cc35fff19c4d547e7c8eaabfbc72667d716d5b604982e2d704f2"
-                  },
                   {
                     "id": "sha256:86d305a1466a596f8b436561d674f2510f268bed9e73f56c87da1dd120f99c18"
                   },
@@ -1821,9 +1800,6 @@
                   {
                     "id": "sha256:b4169eded939e7c596da378f94776255a86790ded4cf749e3b62ce809040f183"
                   },
-                  {
-                    "id": "sha256:66ea1e3d0bfb3d08a0383cec05f9d51b598ad5fbc528fb980f38688bb7ede8ed"
-                  },
                   {
                     "id": "sha256:3446bbd5d26c3a1b8cd64c077ae4bbeea8ef2ef349c590297bbe2a53e18ce9e6"
                   },
@@ -1869,12 +1845,6 @@
                   {
                     "id": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
                   },
-                  {
-                    "id": "sha256:5293624aaec9da3557c32d1c0792a4ec6b2db1a63b77ac2ef3cb283da15490e9"
-                  },
-                  {
-                    "id": "sha256:40c199fa3a31697ae9aa7a2ee1c37539faf7be0fbc81a6216332c77c99927b5c"
-                  },
                   {
                     "id": "sha256:db3e2f66d04da2a8646171421a55af9675cdd22747a7f43777fc8b1fb588ab5e"
                   },
@@ -2574,9 +2544,6 @@
                   {
                     "id": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
                   },
-                  {
-                    "id": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
-                  },
                   {
                     "id": "sha256:ca3e0ec3842accbc0b801561a716708261f7fac32fcccaa6bf70bd862739aa67",
                     "options": {
@@ -5638,30 +5605,6 @@
               "zone": "Etc/UTC"
             }
           },
-          {
-            "type": "org.osbuild.firewall",
-            "options": {
-              "ports": [
-                "23364:tcp",
-                "25:tcp",
-                "3528:tcp",
-                "3529:tcp",
-                "45700:tcp",
-                "4712:tcp",
-                "4713:tcp",
-                "54200:tcp",
-                "54688:tcp",
-                "55200:tcp",
-                "57600:tcp",
-                "7600:tcp",
-                "8009:tcp",
-                "8080:tcp",
-                "8443:tcp",
-                "9990:tcp",
-                "9993:tcp"
-              ]
-            }
-          },
           {
             "type": "org.osbuild.sysconfig",
             "options": {
@@ -5959,7 +5902,6 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
@@ -7027,9 +6969,6 @@
           "sha256:331b405a0b2b4bf93534af445da72d35eb1acd9ce66bd2d84f8ae5b169097d24": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-hibernate-search-engine-5.10.7-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-rhui-azure-20230418/Packages/r/rhui-azure-rhel8-2.2-484.noarch.rpm"
-          },
           "sha256:336ed0cd6b743583edda90cb5730ca407721f6336b8d5eeca7d25981fcb4b28c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/sudo-1.8.29-8.el8.x86_64.rpm"
           },
@@ -7147,9 +7086,6 @@
           "sha256:3d6a5eeb0da36ce36cd6ddc5e3c2d2bc36cd5962d1450077c5c5754b8f5ac02c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/glib2-2.56.4-159.el8.x86_64.rpm"
           },
-          "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ipset-libs-7.1-1.el8.x86_64.rpm"
-          },
           "sha256:3db2de8520dfeb4ba9c6bfa692b979e5de98c2c4149b998591292db68fadea3d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-resteasy-client-3.15.4-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -7189,9 +7125,6 @@
           "sha256:40764300711f086a034db7736c9e987ae1b60d2689ff2ec9aab1884113b35110": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-glassfish-jsf-2.3.14-6.SP07_redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:40c199fa3a31697ae9aa7a2ee1c37539faf7be0fbc81a6216332c77c99927b5c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-slip-dbus-0.6.4-13.el8.noarch.rpm"
-          },
           "sha256:40e20c28cc28db273a7e08a9351fb52224a9d46d8b178cee6fedb6487f47785c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-resteasy-atom-provider-3.15.4-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -7204,9 +7137,6 @@
           "sha256:4229196b5ea88c1133d5509a2ec326093a2c7ac5566ca4abb55c3d6fab47130a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-gobject-3.28.3-2.el8.x86_64.rpm"
           },
-          "sha256:429fa2b6cbe901b802e2acf8ed1b6005ff3b16d28915db6674b0621d9d8da657": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/iptables-ebtables-1.8.4-23.el8.x86_64.rpm"
-          },
           "sha256:42b2221eb7118f2a10bbe67ba22e6876cdad05f9db6ae0e057d556041555dc7f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/python3-pyasn1-0.3.7-6.el8.noarch.rpm"
           },
@@ -7216,9 +7146,6 @@
           "sha256:441c3514b1526c53e2f71cf5546c67df7c2a48b3231cc13fdb99fed530ebc7ec": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-stax-ex-1.8.3-2.redhat_00002.1.el8eap.noarch.rpm"
           },
-          "sha256:442e58693d7a5a0ac84e35faa5ae86c2588ae7467918947de118ade0d0673ab8": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/nftables-0.9.3-26.el8.x86_64.rpm"
-          },
           "sha256:44b730f4e2e8ecec7e15627050f8baf4910c66ba8caeb40c874f5011c9a23b30": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-wildfly-http-ejb-client-1.1.13-1.SP1_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -7426,9 +7353,6 @@
           "sha256:5249276af28b8abe2c2f6782aba5cf7793fff19faa2ad124b0bfed7e1ea0eb98": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/quota-4.04-14.el8.x86_64.rpm"
           },
-          "sha256:5293624aaec9da3557c32d1c0792a4ec6b2db1a63b77ac2ef3cb283da15490e9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-slip-0.6.4-13.el8.noarch.rpm"
-          },
           "sha256:5348506e9fa17558bae75af2fc38f1cf663101b7a33a7c0139954473c94c7b3a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/kernel-4.18.0-425.3.1.el8.x86_64.rpm"
           },
@@ -7639,9 +7563,6 @@
           "sha256:6604ce621bb3dad2635a880c85373dcbd70ef7aac336eaa8ef468b2809ad7aba": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-json-patch-1.9.0-1.redhat_00002.1.el8eap.noarch.rpm"
           },
-          "sha256:66ea1e3d0bfb3d08a0383cec05f9d51b598ad5fbc528fb980f38688bb7ede8ed": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-nftables-0.9.3-26.el8.x86_64.rpm"
-          },
           "sha256:66f2b8c95fe5ccb425ed30188476a6fbabf9bed4f6aa8febe6a0825efd34b490": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-netty-buffer-4.1.77-3.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -8479,9 +8400,6 @@
           "sha256:aa37a6221176cf80572b349c56a8320089cb4cf9ad452f88c5337ddf27ef6ab8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/cups-libs-2.2.6-50.el8.x86_64.rpm"
           },
-          "sha256:aa45417d26f9cc35fff19c4d547e7c8eaabfbc72667d716d5b604982e2d704f2": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-firewall-0.9.3-13.el8.noarch.rpm"
-          },
           "sha256:ab84e6fc9ce10d440b7b0720a4c92e4562d710d620e01ac30706b9b4ce186c76": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-bouncycastle-pkix-1.68.0-2.redhat_00005.1.el8eap.noarch.rpm"
           },
@@ -8737,9 +8655,6 @@
           "sha256:c112d94ff1596ed32b70d70f17fc02ad6b3265ac2083c2be1608afcf3b60ff03": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libnftnl-1.1.5-5.el8.x86_64.rpm"
           },
-          "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ipset-7.1-1.el8.x86_64.rpm"
-          },
           "sha256:c1c683a37f4cdf4ed85f3bf60f6bec3bad9cc5be68f896cdd509c0c09f3dac4a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-lucene-core-5.5.5-3.redhat_2.1.el8eap.noarch.rpm"
           },
@@ -8797,9 +8712,6 @@
           "sha256:c504e02ff8af5607b7b23bcdceee78f728ab16a9adc053bd774739d520d95ecb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/pcre2-10.32-3.el8_6.x86_64.rpm"
           },
-          "sha256:c52e10db6de5ed833dfb2060921b4e209747db7d2b482034e52baca04db59f8f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/firewalld-0.9.3-13.el8.noarch.rpm"
-          },
           "sha256:c5d0c9a5acc6c2de5e52b38701d6cad5cc37d22c1cb518ca8bcac79bddffaaba": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/libappstream-glib-0.7.14-3.el8.x86_64.rpm"
           },
@@ -9391,9 +9303,6 @@
           "sha256:f60a876a1786b73dd9b8c39078a5b9bf543d3c1200c6cc46186b4aeedf81b2b1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-httpcomponents-client-4.5.13-1.redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:f60b1d583cc9d2a3fa61fd2ed576cc22e1494f1cdb2a0eb6552b6b4e0b10194d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/firewalld-filesystem-0.9.3-13.el8.noarch.rpm"
-          },
           "sha256:f67e4d60d0cbef8258a722297597d1cd71b4fda24544cf8ba7c64914592bb51f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-joda-time-2.9.7-2.redhat_1.1.el8eap.noarch.rpm"
           },
@@ -12117,24 +12026,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/findutils-4.6.0-20.el8.x86_64.rpm",
         "checksum": "sha256:ce63708391f77873a344a2ff1ff148be88a5bac39693c9d0bb458f7b3ebd63b9"
       },
-      {
-        "name": "firewalld",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/firewalld-0.9.3-13.el8.noarch.rpm",
-        "checksum": "sha256:c52e10db6de5ed833dfb2060921b4e209747db7d2b482034e52baca04db59f8f"
-      },
-      {
-        "name": "firewalld-filesystem",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/firewalld-filesystem-0.9.3-13.el8.noarch.rpm",
-        "checksum": "sha256:f60b1d583cc9d2a3fa61fd2ed576cc22e1494f1cdb2a0eb6552b6b4e0b10194d"
-      },
       {
         "name": "fontconfig",
         "epoch": 0,
@@ -12540,24 +12431,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/iproute-5.18.0-1.el8.x86_64.rpm",
         "checksum": "sha256:13efcd2defaca16875c6606d923440612d664fb6733979ab1d01a6d02bed9edd"
       },
-      {
-        "name": "ipset",
-        "epoch": 0,
-        "version": "7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ipset-7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae"
-      },
-      {
-        "name": "ipset-libs",
-        "epoch": 0,
-        "version": "7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/ipset-libs-7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7"
-      },
       {
         "name": "iptables",
         "epoch": 0,
@@ -12567,15 +12440,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/iptables-1.8.4-23.el8.x86_64.rpm",
         "checksum": "sha256:cadee8f05630b81adc4c4ffb82359a28b5201ff31e0ab590645c190c2ae1149a"
       },
-      {
-        "name": "iptables-ebtables",
-        "epoch": 0,
-        "version": "1.8.4",
-        "release": "23.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/iptables-ebtables-1.8.4-23.el8.x86_64.rpm",
-        "checksum": "sha256:429fa2b6cbe901b802e2acf8ed1b6005ff3b16d28915db6674b0621d9d8da657"
-      },
       {
         "name": "iptables-libs",
         "epoch": 0,
@@ -14115,15 +13979,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/newt-0.52.20-11.el8.x86_64.rpm",
         "checksum": "sha256:eb9b37827f1851c8a2683cd86026fda90847afe90d51ea746d7cd5f49f6f90d1"
       },
-      {
-        "name": "nftables",
-        "epoch": 1,
-        "version": "0.9.3",
-        "release": "26.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/nftables-0.9.3-26.el8.x86_64.rpm",
-        "checksum": "sha256:442e58693d7a5a0ac84e35faa5ae86c2588ae7467918947de118ade0d0673ab8"
-      },
       {
         "name": "npth",
         "epoch": 0,
@@ -14592,15 +14447,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-ethtool-0.14-5.el8.x86_64.rpm",
         "checksum": "sha256:7540cda72b29722509f43e724c6095db62b8f080064ab4d1eccf39537e458c97"
       },
-      {
-        "name": "python3-firewall",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-firewall-0.9.3-13.el8.noarch.rpm",
-        "checksum": "sha256:aa45417d26f9cc35fff19c4d547e7c8eaabfbc72667d716d5b604982e2d704f2"
-      },
       {
         "name": "python3-gobject-base",
         "epoch": 0,
@@ -14754,15 +14600,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-magic-5.33-21.el8.noarch.rpm",
         "checksum": "sha256:b4169eded939e7c596da378f94776255a86790ded4cf749e3b62ce809040f183"
       },
-      {
-        "name": "python3-nftables",
-        "epoch": 1,
-        "version": "0.9.3",
-        "release": "26.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-nftables-0.9.3-26.el8.x86_64.rpm",
-        "checksum": "sha256:66ea1e3d0bfb3d08a0383cec05f9d51b598ad5fbc528fb980f38688bb7ede8ed"
-      },
       {
         "name": "python3-oauthlib",
         "epoch": 0,
@@ -14898,24 +14735,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-six-1.11.0-8.el8.noarch.rpm",
         "checksum": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
       },
-      {
-        "name": "python3-slip",
-        "epoch": 0,
-        "version": "0.6.4",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-slip-0.6.4-13.el8.noarch.rpm",
-        "checksum": "sha256:5293624aaec9da3557c32d1c0792a4ec6b2db1a63b77ac2ef3cb283da15490e9"
-      },
-      {
-        "name": "python3-slip-dbus",
-        "epoch": 0,
-        "version": "0.6.4",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.7-20221015/Packages/python3-slip-dbus-0.6.4-13.el8.noarch.rpm",
-        "checksum": "sha256:40c199fa3a31697ae9aa7a2ee1c37539faf7be0fbc81a6216332c77c99927b5c"
-      },
       {
         "name": "python3-sssdconfig",
         "epoch": 0,
@@ -17013,15 +16832,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.7-20221015/Packages/xorg-x11-fonts-Type1-7.5-19.el8.noarch.rpm",
         "checksum": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
       },
-      {
-        "name": "rhui-azure-rhel8",
-        "epoch": 0,
-        "version": "2.2",
-        "release": "484",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-rhui-azure-20230418/Packages/r/rhui-azure-rhel8-2.2-484.noarch.rpm",
-        "checksum": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
-      },
       {
         "name": "eap7-FastInfoset",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json
index ba9846809..932b72b98 100644
--- a/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json
@@ -2848,12 +2848,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json
index 268e08443..14583fcbd 100644
--- a/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-azure_sap_rhui-boot.json
@@ -3506,12 +3506,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_87-x86_64-vhd-boot.json b/test/data/manifests/rhel_87-x86_64-vhd-boot.json
index 3d953b652..28bd462db 100644
--- a/test/data/manifests/rhel_87-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-vhd-boot.json
@@ -2798,12 +2798,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_88-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_88-aarch64-azure_rhui-boot.json
index f1f5caafa..2c87320fa 100644
--- a/test/data/manifests/rhel_88-aarch64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-azure_rhui-boot.json
@@ -2795,12 +2795,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_88-aarch64-vhd-boot.json b/test/data/manifests/rhel_88-aarch64-vhd-boot.json
index 9e927dadb..f30ec5a5a 100644
--- a/test/data/manifests/rhel_88-aarch64-vhd-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-vhd-boot.json
@@ -2746,12 +2746,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_88-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_88-x86_64-azure_eap7_rhui-boot.json
index 518fce843..f19204ae8 100644
--- a/test/data/manifests/rhel_88-x86_64-azure_eap7_rhui-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-azure_eap7_rhui-boot.json
@@ -942,12 +942,6 @@
                   {
                     "id": "sha256:ce63708391f77873a344a2ff1ff148be88a5bac39693c9d0bb458f7b3ebd63b9"
                   },
-                  {
-                    "id": "sha256:c52e10db6de5ed833dfb2060921b4e209747db7d2b482034e52baca04db59f8f"
-                  },
-                  {
-                    "id": "sha256:f60b1d583cc9d2a3fa61fd2ed576cc22e1494f1cdb2a0eb6552b6b4e0b10194d"
-                  },
                   {
                     "id": "sha256:7f2a8ed367bbe341e4c7570746cdeada3b68f6d1e498b411748b972190bce95c"
                   },
@@ -1083,18 +1077,9 @@
                   {
                     "id": "sha256:13efcd2defaca16875c6606d923440612d664fb6733979ab1d01a6d02bed9edd"
                   },
-                  {
-                    "id": "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae"
-                  },
-                  {
-                    "id": "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7"
-                  },
                   {
                     "id": "sha256:cadee8f05630b81adc4c4ffb82359a28b5201ff31e0ab590645c190c2ae1149a"
                   },
-                  {
-                    "id": "sha256:429fa2b6cbe901b802e2acf8ed1b6005ff3b16d28915db6674b0621d9d8da657"
-                  },
                   {
                     "id": "sha256:471930ec9d0e115809eaae8aa5c888bc07104c600ff49b55ab746701691c7c0d"
                   },
@@ -1608,9 +1593,6 @@
                   {
                     "id": "sha256:eb9b37827f1851c8a2683cd86026fda90847afe90d51ea746d7cd5f49f6f90d1"
                   },
-                  {
-                    "id": "sha256:442e58693d7a5a0ac84e35faa5ae86c2588ae7467918947de118ade0d0673ab8"
-                  },
                   {
                     "id": "sha256:4f3c2518a3a02e4cec426928f8e5b28d9318af2b1aeaf7fc77f9d4a313f09740"
                   },
@@ -1767,9 +1749,6 @@
                   {
                     "id": "sha256:7540cda72b29722509f43e724c6095db62b8f080064ab4d1eccf39537e458c97"
                   },
-                  {
-                    "id": "sha256:aa45417d26f9cc35fff19c4d547e7c8eaabfbc72667d716d5b604982e2d704f2"
-                  },
                   {
                     "id": "sha256:86d305a1466a596f8b436561d674f2510f268bed9e73f56c87da1dd120f99c18"
                   },
@@ -1821,9 +1800,6 @@
                   {
                     "id": "sha256:b4169eded939e7c596da378f94776255a86790ded4cf749e3b62ce809040f183"
                   },
-                  {
-                    "id": "sha256:66ea1e3d0bfb3d08a0383cec05f9d51b598ad5fbc528fb980f38688bb7ede8ed"
-                  },
                   {
                     "id": "sha256:3446bbd5d26c3a1b8cd64c077ae4bbeea8ef2ef349c590297bbe2a53e18ce9e6"
                   },
@@ -1869,12 +1845,6 @@
                   {
                     "id": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
                   },
-                  {
-                    "id": "sha256:5293624aaec9da3557c32d1c0792a4ec6b2db1a63b77ac2ef3cb283da15490e9"
-                  },
-                  {
-                    "id": "sha256:40c199fa3a31697ae9aa7a2ee1c37539faf7be0fbc81a6216332c77c99927b5c"
-                  },
                   {
                     "id": "sha256:db3e2f66d04da2a8646171421a55af9675cdd22747a7f43777fc8b1fb588ab5e"
                   },
@@ -2574,9 +2544,6 @@
                   {
                     "id": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
                   },
-                  {
-                    "id": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
-                  },
                   {
                     "id": "sha256:ca3e0ec3842accbc0b801561a716708261f7fac32fcccaa6bf70bd862739aa67",
                     "options": {
@@ -5638,30 +5605,6 @@
               "zone": "Etc/UTC"
             }
           },
-          {
-            "type": "org.osbuild.firewall",
-            "options": {
-              "ports": [
-                "23364:tcp",
-                "25:tcp",
-                "3528:tcp",
-                "3529:tcp",
-                "45700:tcp",
-                "4712:tcp",
-                "4713:tcp",
-                "54200:tcp",
-                "54688:tcp",
-                "55200:tcp",
-                "57600:tcp",
-                "7600:tcp",
-                "8009:tcp",
-                "8080:tcp",
-                "8443:tcp",
-                "9990:tcp",
-                "9993:tcp"
-              ]
-            }
-          },
           {
             "type": "org.osbuild.sysconfig",
             "options": {
@@ -5959,7 +5902,6 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
@@ -7063,9 +7005,6 @@
           "sha256:3332a81a228e74db0d5a840c7d95af3d8998ef834bbc02223f51fff7b01a5d21": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/qemu-img-6.2.0-22.module+el8.8.0+16816+1d3555ec.x86_64.rpm"
           },
-          "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-rhui-azure-20230418/Packages/r/rhui-azure-rhel8-2.2-484.noarch.rpm"
-          },
           "sha256:336ed0cd6b743583edda90cb5730ca407721f6336b8d5eeca7d25981fcb4b28c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/sudo-1.8.29-8.el8.x86_64.rpm"
           },
@@ -7183,9 +7122,6 @@
           "sha256:3d6a5eeb0da36ce36cd6ddc5e3c2d2bc36cd5962d1450077c5c5754b8f5ac02c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/glib2-2.56.4-159.el8.x86_64.rpm"
           },
-          "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/ipset-libs-7.1-1.el8.x86_64.rpm"
-          },
           "sha256:3db2de8520dfeb4ba9c6bfa692b979e5de98c2c4149b998591292db68fadea3d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-resteasy-client-3.15.4-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -7225,9 +7161,6 @@
           "sha256:40764300711f086a034db7736c9e987ae1b60d2689ff2ec9aab1884113b35110": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-glassfish-jsf-2.3.14-6.SP07_redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:40c199fa3a31697ae9aa7a2ee1c37539faf7be0fbc81a6216332c77c99927b5c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-slip-dbus-0.6.4-13.el8.noarch.rpm"
-          },
           "sha256:40e20c28cc28db273a7e08a9351fb52224a9d46d8b178cee6fedb6487f47785c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-resteasy-atom-provider-3.15.4-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -7240,9 +7173,6 @@
           "sha256:4229196b5ea88c1133d5509a2ec326093a2c7ac5566ca4abb55c3d6fab47130a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/python3-gobject-3.28.3-2.el8.x86_64.rpm"
           },
-          "sha256:429fa2b6cbe901b802e2acf8ed1b6005ff3b16d28915db6674b0621d9d8da657": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/iptables-ebtables-1.8.4-23.el8.x86_64.rpm"
-          },
           "sha256:42b2221eb7118f2a10bbe67ba22e6876cdad05f9db6ae0e057d556041555dc7f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/python3-pyasn1-0.3.7-6.el8.noarch.rpm"
           },
@@ -7255,9 +7185,6 @@
           "sha256:441c3514b1526c53e2f71cf5546c67df7c2a48b3231cc13fdb99fed530ebc7ec": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-stax-ex-1.8.3-2.redhat_00002.1.el8eap.noarch.rpm"
           },
-          "sha256:442e58693d7a5a0ac84e35faa5ae86c2588ae7467918947de118ade0d0673ab8": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/nftables-0.9.3-26.el8.x86_64.rpm"
-          },
           "sha256:44447cbfdf0236f20f68d31e1541d43ffcc878da80b7a74691ea71819181fcef": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/libblockdev-fs-2.28-1.el8.x86_64.rpm"
           },
@@ -7459,9 +7386,6 @@
           "sha256:5249276af28b8abe2c2f6782aba5cf7793fff19faa2ad124b0bfed7e1ea0eb98": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/quota-4.04-14.el8.x86_64.rpm"
           },
-          "sha256:5293624aaec9da3557c32d1c0792a4ec6b2db1a63b77ac2ef3cb283da15490e9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-slip-0.6.4-13.el8.noarch.rpm"
-          },
           "sha256:534bbf990d0f0537715561c818c2b68f10e6ba0cc1252a32a0696f1e22fde1e3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-systemd-234-8.el8.x86_64.rpm"
           },
@@ -7681,9 +7605,6 @@
           "sha256:6604ce621bb3dad2635a880c85373dcbd70ef7aac336eaa8ef468b2809ad7aba": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-json-patch-1.9.0-1.redhat_00002.1.el8eap.noarch.rpm"
           },
-          "sha256:66ea1e3d0bfb3d08a0383cec05f9d51b598ad5fbc528fb980f38688bb7ede8ed": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-nftables-0.9.3-26.el8.x86_64.rpm"
-          },
           "sha256:66f2b8c95fe5ccb425ed30188476a6fbabf9bed4f6aa8febe6a0825efd34b490": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-netty-buffer-4.1.77-3.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -8500,9 +8421,6 @@
           "sha256:aa37a6221176cf80572b349c56a8320089cb4cf9ad452f88c5337ddf27ef6ab8": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/cups-libs-2.2.6-50.el8.x86_64.rpm"
           },
-          "sha256:aa45417d26f9cc35fff19c4d547e7c8eaabfbc72667d716d5b604982e2d704f2": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-firewall-0.9.3-13.el8.noarch.rpm"
-          },
           "sha256:ab84e6fc9ce10d440b7b0720a4c92e4562d710d620e01ac30706b9b4ce186c76": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-bouncycastle-pkix-1.68.0-2.redhat_00005.1.el8eap.noarch.rpm"
           },
@@ -8764,9 +8682,6 @@
           "sha256:c112d94ff1596ed32b70d70f17fc02ad6b3265ac2083c2be1608afcf3b60ff03": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libnftnl-1.1.5-5.el8.x86_64.rpm"
           },
-          "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/ipset-7.1-1.el8.x86_64.rpm"
-          },
           "sha256:c1c683a37f4cdf4ed85f3bf60f6bec3bad9cc5be68f896cdd509c0c09f3dac4a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-lucene-core-5.5.5-3.redhat_2.1.el8eap.noarch.rpm"
           },
@@ -8827,9 +8742,6 @@
           "sha256:c504e02ff8af5607b7b23bcdceee78f728ab16a9adc053bd774739d520d95ecb": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/pcre2-10.32-3.el8_6.x86_64.rpm"
           },
-          "sha256:c52e10db6de5ed833dfb2060921b4e209747db7d2b482034e52baca04db59f8f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/firewalld-0.9.3-13.el8.noarch.rpm"
-          },
           "sha256:c5d0c9a5acc6c2de5e52b38701d6cad5cc37d22c1cb518ca8bcac79bddffaaba": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/libappstream-glib-0.7.14-3.el8.x86_64.rpm"
           },
@@ -9391,9 +9303,6 @@
           "sha256:f60a876a1786b73dd9b8c39078a5b9bf543d3c1200c6cc46186b4aeedf81b2b1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-httpcomponents-client-4.5.13-1.redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:f60b1d583cc9d2a3fa61fd2ed576cc22e1494f1cdb2a0eb6552b6b4e0b10194d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/firewalld-filesystem-0.9.3-13.el8.noarch.rpm"
-          },
           "sha256:f67e4d60d0cbef8258a722297597d1cd71b4fda24544cf8ba7c64914592bb51f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-joda-time-2.9.7-2.redhat_1.1.el8eap.noarch.rpm"
           },
@@ -12117,24 +12026,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/findutils-4.6.0-20.el8.x86_64.rpm",
         "checksum": "sha256:ce63708391f77873a344a2ff1ff148be88a5bac39693c9d0bb458f7b3ebd63b9"
       },
-      {
-        "name": "firewalld",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/firewalld-0.9.3-13.el8.noarch.rpm",
-        "checksum": "sha256:c52e10db6de5ed833dfb2060921b4e209747db7d2b482034e52baca04db59f8f"
-      },
-      {
-        "name": "firewalld-filesystem",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/firewalld-filesystem-0.9.3-13.el8.noarch.rpm",
-        "checksum": "sha256:f60b1d583cc9d2a3fa61fd2ed576cc22e1494f1cdb2a0eb6552b6b4e0b10194d"
-      },
       {
         "name": "fontconfig",
         "epoch": 0,
@@ -12540,24 +12431,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/iproute-5.18.0-1.el8.x86_64.rpm",
         "checksum": "sha256:13efcd2defaca16875c6606d923440612d664fb6733979ab1d01a6d02bed9edd"
       },
-      {
-        "name": "ipset",
-        "epoch": 0,
-        "version": "7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/ipset-7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae"
-      },
-      {
-        "name": "ipset-libs",
-        "epoch": 0,
-        "version": "7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/ipset-libs-7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7"
-      },
       {
         "name": "iptables",
         "epoch": 0,
@@ -12567,15 +12440,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/iptables-1.8.4-23.el8.x86_64.rpm",
         "checksum": "sha256:cadee8f05630b81adc4c4ffb82359a28b5201ff31e0ab590645c190c2ae1149a"
       },
-      {
-        "name": "iptables-ebtables",
-        "epoch": 0,
-        "version": "1.8.4",
-        "release": "23.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/iptables-ebtables-1.8.4-23.el8.x86_64.rpm",
-        "checksum": "sha256:429fa2b6cbe901b802e2acf8ed1b6005ff3b16d28915db6674b0621d9d8da657"
-      },
       {
         "name": "iptables-libs",
         "epoch": 0,
@@ -14115,15 +13979,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/newt-0.52.20-11.el8.x86_64.rpm",
         "checksum": "sha256:eb9b37827f1851c8a2683cd86026fda90847afe90d51ea746d7cd5f49f6f90d1"
       },
-      {
-        "name": "nftables",
-        "epoch": 1,
-        "version": "0.9.3",
-        "release": "26.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/nftables-0.9.3-26.el8.x86_64.rpm",
-        "checksum": "sha256:442e58693d7a5a0ac84e35faa5ae86c2588ae7467918947de118ade0d0673ab8"
-      },
       {
         "name": "npth",
         "epoch": 0,
@@ -14592,15 +14447,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-ethtool-0.14-5.el8.x86_64.rpm",
         "checksum": "sha256:7540cda72b29722509f43e724c6095db62b8f080064ab4d1eccf39537e458c97"
       },
-      {
-        "name": "python3-firewall",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-firewall-0.9.3-13.el8.noarch.rpm",
-        "checksum": "sha256:aa45417d26f9cc35fff19c4d547e7c8eaabfbc72667d716d5b604982e2d704f2"
-      },
       {
         "name": "python3-gobject-base",
         "epoch": 0,
@@ -14754,15 +14600,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-magic-5.33-21.el8.noarch.rpm",
         "checksum": "sha256:b4169eded939e7c596da378f94776255a86790ded4cf749e3b62ce809040f183"
       },
-      {
-        "name": "python3-nftables",
-        "epoch": 1,
-        "version": "0.9.3",
-        "release": "26.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-nftables-0.9.3-26.el8.x86_64.rpm",
-        "checksum": "sha256:66ea1e3d0bfb3d08a0383cec05f9d51b598ad5fbc528fb980f38688bb7ede8ed"
-      },
       {
         "name": "python3-oauthlib",
         "epoch": 0,
@@ -14898,24 +14735,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-six-1.11.0-8.el8.noarch.rpm",
         "checksum": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
       },
-      {
-        "name": "python3-slip",
-        "epoch": 0,
-        "version": "0.6.4",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-slip-0.6.4-13.el8.noarch.rpm",
-        "checksum": "sha256:5293624aaec9da3557c32d1c0792a4ec6b2db1a63b77ac2ef3cb283da15490e9"
-      },
-      {
-        "name": "python3-slip-dbus",
-        "epoch": 0,
-        "version": "0.6.4",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.8-20221025/Packages/python3-slip-dbus-0.6.4-13.el8.noarch.rpm",
-        "checksum": "sha256:40c199fa3a31697ae9aa7a2ee1c37539faf7be0fbc81a6216332c77c99927b5c"
-      },
       {
         "name": "python3-sssdconfig",
         "epoch": 0,
@@ -17013,15 +16832,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.8-20221025/Packages/xorg-x11-fonts-Type1-7.5-19.el8.noarch.rpm",
         "checksum": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
       },
-      {
-        "name": "rhui-azure-rhel8",
-        "epoch": 0,
-        "version": "2.2",
-        "release": "484",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-rhui-azure-20230418/Packages/r/rhui-azure-rhel8-2.2-484.noarch.rpm",
-        "checksum": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
-      },
       {
         "name": "eap7-FastInfoset",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json
index 679de8f8f..f33d52917 100644
--- a/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-azure_rhui-boot.json
@@ -2848,12 +2848,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json
index 9cd565af9..c0260b1ac 100644
--- a/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-azure_sap_rhui-boot.json
@@ -3506,12 +3506,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_88-x86_64-vhd-boot.json b/test/data/manifests/rhel_88-x86_64-vhd-boot.json
index 9519d7b01..84e8cfc02 100644
--- a/test/data/manifests/rhel_88-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-vhd-boot.json
@@ -2798,12 +2798,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_89-aarch64-azure_rhui-boot.json b/test/data/manifests/rhel_89-aarch64-azure_rhui-boot.json
index 5e4bd51c0..a28619d17 100644
--- a/test/data/manifests/rhel_89-aarch64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_89-aarch64-azure_rhui-boot.json
@@ -2795,12 +2795,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_89-aarch64-vhd-boot.json b/test/data/manifests/rhel_89-aarch64-vhd-boot.json
index d64ef5915..8b6d2225d 100644
--- a/test/data/manifests/rhel_89-aarch64-vhd-boot.json
+++ b/test/data/manifests/rhel_89-aarch64-vhd-boot.json
@@ -2746,12 +2746,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_89-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_89-x86_64-azure_eap7_rhui-boot.json
index 9b326857f..0066693ba 100644
--- a/test/data/manifests/rhel_89-x86_64-azure_eap7_rhui-boot.json
+++ b/test/data/manifests/rhel_89-x86_64-azure_eap7_rhui-boot.json
@@ -942,12 +942,6 @@
                   {
                     "id": "sha256:ce63708391f77873a344a2ff1ff148be88a5bac39693c9d0bb458f7b3ebd63b9"
                   },
-                  {
-                    "id": "sha256:c52e10db6de5ed833dfb2060921b4e209747db7d2b482034e52baca04db59f8f"
-                  },
-                  {
-                    "id": "sha256:f60b1d583cc9d2a3fa61fd2ed576cc22e1494f1cdb2a0eb6552b6b4e0b10194d"
-                  },
                   {
                     "id": "sha256:7f2a8ed367bbe341e4c7570746cdeada3b68f6d1e498b411748b972190bce95c"
                   },
@@ -1083,18 +1077,9 @@
                   {
                     "id": "sha256:13efcd2defaca16875c6606d923440612d664fb6733979ab1d01a6d02bed9edd"
                   },
-                  {
-                    "id": "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae"
-                  },
-                  {
-                    "id": "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7"
-                  },
                   {
                     "id": "sha256:43d942267a0de0ad1b24d73c67ed4290ebb9696f408a00fc0a75102bf25e6fda"
                   },
-                  {
-                    "id": "sha256:1e6a826c2e8bbd12e7a342118e09f72986a3d7e79f48c159565f77b83b7710ef"
-                  },
                   {
                     "id": "sha256:771f85c018041268ab58275b0733a4dbe0809ac72007eb176f46146012d1584d"
                   },
@@ -1608,9 +1593,6 @@
                   {
                     "id": "sha256:eb9b37827f1851c8a2683cd86026fda90847afe90d51ea746d7cd5f49f6f90d1"
                   },
-                  {
-                    "id": "sha256:442e58693d7a5a0ac84e35faa5ae86c2588ae7467918947de118ade0d0673ab8"
-                  },
                   {
                     "id": "sha256:4f3c2518a3a02e4cec426928f8e5b28d9318af2b1aeaf7fc77f9d4a313f09740"
                   },
@@ -1767,9 +1749,6 @@
                   {
                     "id": "sha256:7540cda72b29722509f43e724c6095db62b8f080064ab4d1eccf39537e458c97"
                   },
-                  {
-                    "id": "sha256:aa45417d26f9cc35fff19c4d547e7c8eaabfbc72667d716d5b604982e2d704f2"
-                  },
                   {
                     "id": "sha256:86d305a1466a596f8b436561d674f2510f268bed9e73f56c87da1dd120f99c18"
                   },
@@ -1821,9 +1800,6 @@
                   {
                     "id": "sha256:028f5d98c3c16a7352fdf78315c61285d51ba886de7494b19ba0d7dac0934d53"
                   },
-                  {
-                    "id": "sha256:66ea1e3d0bfb3d08a0383cec05f9d51b598ad5fbc528fb980f38688bb7ede8ed"
-                  },
                   {
                     "id": "sha256:3446bbd5d26c3a1b8cd64c077ae4bbeea8ef2ef349c590297bbe2a53e18ce9e6"
                   },
@@ -1869,12 +1845,6 @@
                   {
                     "id": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
                   },
-                  {
-                    "id": "sha256:5293624aaec9da3557c32d1c0792a4ec6b2db1a63b77ac2ef3cb283da15490e9"
-                  },
-                  {
-                    "id": "sha256:40c199fa3a31697ae9aa7a2ee1c37539faf7be0fbc81a6216332c77c99927b5c"
-                  },
                   {
                     "id": "sha256:6cbfbd286d82b92ba9daad89fbae6493559fdde30d8bc808510be8056d4af552"
                   },
@@ -2574,9 +2544,6 @@
                   {
                     "id": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
                   },
-                  {
-                    "id": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
-                  },
                   {
                     "id": "sha256:ca3e0ec3842accbc0b801561a716708261f7fac32fcccaa6bf70bd862739aa67",
                     "options": {
@@ -5638,30 +5605,6 @@
               "zone": "Etc/UTC"
             }
           },
-          {
-            "type": "org.osbuild.firewall",
-            "options": {
-              "ports": [
-                "23364:tcp",
-                "25:tcp",
-                "3528:tcp",
-                "3529:tcp",
-                "45700:tcp",
-                "4712:tcp",
-                "4713:tcp",
-                "54200:tcp",
-                "54688:tcp",
-                "55200:tcp",
-                "57600:tcp",
-                "7600:tcp",
-                "8009:tcp",
-                "8080:tcp",
-                "8443:tcp",
-                "9990:tcp",
-                "9993:tcp"
-              ]
-            }
-          },
           {
             "type": "org.osbuild.sysconfig",
             "options": {
@@ -5959,7 +5902,6 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
@@ -6820,9 +6762,6 @@
           "sha256:1e48851f4cc15e445b3146d7cafbd2f42b58022a90cc24f83db911a3a01adb0a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-jboss-websocket-api_1.1_spec-2.0.0-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:1e6a826c2e8bbd12e7a342118e09f72986a3d7e79f48c159565f77b83b7710ef": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/iptables-ebtables-1.8.4-24.el8.x86_64.rpm"
-          },
           "sha256:1e746a02860e37f679a8d56c3217ac2e0bd62a9fe87e34d49daefa1deefd14a2": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-picketlink-api-2.5.5-21.SP12_redhat_00011.1.el8eap.noarch.rpm"
           },
@@ -7048,9 +6987,6 @@
           "sha256:331b405a0b2b4bf93534af445da72d35eb1acd9ce66bd2d84f8ae5b169097d24": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-hibernate-search-engine-5.10.7-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-rhui-azure-20230418/Packages/r/rhui-azure-rhel8-2.2-484.noarch.rpm"
-          },
           "sha256:3384bccab530807195eb9d72547aa588bdea55567ca86d1719f32402bf1cd0c9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/libpsl-0.20.2-6.el8.x86_64.rpm"
           },
@@ -7147,9 +7083,6 @@
           "sha256:3cc2dc1ee5132c789d05458ab1bf9e01fe78e1cc1813d8602297bdda6dd30731": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.9-20230316/Packages/libbytesize-1.4-3.el8.x86_64.rpm"
           },
-          "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/ipset-libs-7.1-1.el8.x86_64.rpm"
-          },
           "sha256:3db2de8520dfeb4ba9c6bfa692b979e5de98c2c4149b998591292db68fadea3d": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-resteasy-client-3.15.4-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -7186,9 +7119,6 @@
           "sha256:40764300711f086a034db7736c9e987ae1b60d2689ff2ec9aab1884113b35110": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-glassfish-jsf-2.3.14-6.SP07_redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:40c199fa3a31697ae9aa7a2ee1c37539faf7be0fbc81a6216332c77c99927b5c": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-slip-dbus-0.6.4-13.el8.noarch.rpm"
-          },
           "sha256:40e20c28cc28db273a7e08a9351fb52224a9d46d8b178cee6fedb6487f47785c": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-resteasy-atom-provider-3.15.4-1.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -7228,9 +7158,6 @@
           "sha256:44206ab38c987e557ea9f9a4524e09db099af428ea833f90adc79e6986cf13f9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-subscription-manager-rhsm-1.28.36-2.el8.x86_64.rpm"
           },
-          "sha256:442e58693d7a5a0ac84e35faa5ae86c2588ae7467918947de118ade0d0673ab8": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/nftables-0.9.3-26.el8.x86_64.rpm"
-          },
           "sha256:447e59d3ec8ba2608f2b92552c242e7d8eb1cdf1d8fb0a923a24c86d4851e2b9": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/subscription-manager-cockpit-1.28.36-2.el8.noarch.rpm"
           },
@@ -7405,9 +7332,6 @@
           "sha256:528e88969137f10aded7bd679448afcaf52fcba396b0828484c94b5c3e669e72": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/dnf-data-4.7.0-15.el8.noarch.rpm"
           },
-          "sha256:5293624aaec9da3557c32d1c0792a4ec6b2db1a63b77ac2ef3cb283da15490e9": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-slip-0.6.4-13.el8.noarch.rpm"
-          },
           "sha256:534bbf990d0f0537715561c818c2b68f10e6ba0cc1252a32a0696f1e22fde1e3": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-systemd-234-8.el8.x86_64.rpm"
           },
@@ -7615,9 +7539,6 @@
           "sha256:6604ce621bb3dad2635a880c85373dcbd70ef7aac336eaa8ef468b2809ad7aba": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-json-patch-1.9.0-1.redhat_00002.1.el8eap.noarch.rpm"
           },
-          "sha256:66ea1e3d0bfb3d08a0383cec05f9d51b598ad5fbc528fb980f38688bb7ede8ed": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-nftables-0.9.3-26.el8.x86_64.rpm"
-          },
           "sha256:66f2b8c95fe5ccb425ed30188476a6fbabf9bed4f6aa8febe6a0825efd34b490": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-netty-buffer-4.1.77-3.Final_redhat_00001.1.el8eap.noarch.rpm"
           },
@@ -8470,9 +8391,6 @@
           "sha256:aa20eb58a6e657d6b4c51521471f31dfc6ee310c76e10ba42380b1a58ae612e1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.9-20230316/Packages/uuid-1.6.2-43.el8.x86_64.rpm"
           },
-          "sha256:aa45417d26f9cc35fff19c4d547e7c8eaabfbc72667d716d5b604982e2d704f2": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-firewall-0.9.3-13.el8.noarch.rpm"
-          },
           "sha256:ab3b7662f83965a7b58e08cd01bbce5e3b5940d7e24bf55b356432d11e566b27": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/tzdata-2022g-2.el8.noarch.rpm"
           },
@@ -8725,9 +8643,6 @@
           "sha256:c112d94ff1596ed32b70d70f17fc02ad6b3265ac2083c2be1608afcf3b60ff03": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/libnftnl-1.1.5-5.el8.x86_64.rpm"
           },
-          "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/ipset-7.1-1.el8.x86_64.rpm"
-          },
           "sha256:c1c683a37f4cdf4ed85f3bf60f6bec3bad9cc5be68f896cdd509c0c09f3dac4a": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-lucene-core-5.5.5-3.redhat_2.1.el8eap.noarch.rpm"
           },
@@ -8785,9 +8700,6 @@
           "sha256:c51815927e09c9aec10fbdd942646d90ff83fd7576ea47b2a460516a59473f2e": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.9-20230316/Packages/cockpit-packagekit-286.1-1.el8.noarch.rpm"
           },
-          "sha256:c52e10db6de5ed833dfb2060921b4e209747db7d2b482034e52baca04db59f8f": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/firewalld-0.9.3-13.el8.noarch.rpm"
-          },
           "sha256:c5adbb47375971ea25ca13ae9f56dbf025b0fa1a48dfea1c39af9b6abc6e16a6": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/grub2-common-2.02-148.el8.noarch.rpm"
           },
@@ -9403,9 +9315,6 @@
           "sha256:f60a876a1786b73dd9b8c39078a5b9bf543d3c1200c6cc46186b4aeedf81b2b1": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-httpcomponents-client-4.5.13-1.redhat_00001.1.el8eap.noarch.rpm"
           },
-          "sha256:f60b1d583cc9d2a3fa61fd2ed576cc22e1494f1cdb2a0eb6552b6b4e0b10194d": {
-            "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/firewalld-filesystem-0.9.3-13.el8.noarch.rpm"
-          },
           "sha256:f67e4d60d0cbef8258a722297597d1cd71b4fda24544cf8ba7c64914592bb51f": {
             "url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-jbeap7-20230202/Packages/eap7-joda-time-2.9.7-2.redhat_1.1.el8eap.noarch.rpm"
           },
@@ -12117,24 +12026,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/findutils-4.6.0-20.el8.x86_64.rpm",
         "checksum": "sha256:ce63708391f77873a344a2ff1ff148be88a5bac39693c9d0bb458f7b3ebd63b9"
       },
-      {
-        "name": "firewalld",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/firewalld-0.9.3-13.el8.noarch.rpm",
-        "checksum": "sha256:c52e10db6de5ed833dfb2060921b4e209747db7d2b482034e52baca04db59f8f"
-      },
-      {
-        "name": "firewalld-filesystem",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/firewalld-filesystem-0.9.3-13.el8.noarch.rpm",
-        "checksum": "sha256:f60b1d583cc9d2a3fa61fd2ed576cc22e1494f1cdb2a0eb6552b6b4e0b10194d"
-      },
       {
         "name": "fontconfig",
         "epoch": 0,
@@ -12540,24 +12431,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/iproute-5.18.0-1.el8.x86_64.rpm",
         "checksum": "sha256:13efcd2defaca16875c6606d923440612d664fb6733979ab1d01a6d02bed9edd"
       },
-      {
-        "name": "ipset",
-        "epoch": 0,
-        "version": "7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/ipset-7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:c193b87ad1690e81ca35ec1f1f7dff94f179907ed13d5b7936c189ff5f8f2bae"
-      },
-      {
-        "name": "ipset-libs",
-        "epoch": 0,
-        "version": "7.1",
-        "release": "1.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/ipset-libs-7.1-1.el8.x86_64.rpm",
-        "checksum": "sha256:3d807ee0bd43ba2cfbc5fa3678963fb706898bd41588a29330c315a9d88ab2a7"
-      },
       {
         "name": "iptables",
         "epoch": 0,
@@ -12567,15 +12440,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/iptables-1.8.4-24.el8.x86_64.rpm",
         "checksum": "sha256:43d942267a0de0ad1b24d73c67ed4290ebb9696f408a00fc0a75102bf25e6fda"
       },
-      {
-        "name": "iptables-ebtables",
-        "epoch": 0,
-        "version": "1.8.4",
-        "release": "24.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/iptables-ebtables-1.8.4-24.el8.x86_64.rpm",
-        "checksum": "sha256:1e6a826c2e8bbd12e7a342118e09f72986a3d7e79f48c159565f77b83b7710ef"
-      },
       {
         "name": "iptables-libs",
         "epoch": 0,
@@ -14115,15 +13979,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/newt-0.52.20-11.el8.x86_64.rpm",
         "checksum": "sha256:eb9b37827f1851c8a2683cd86026fda90847afe90d51ea746d7cd5f49f6f90d1"
       },
-      {
-        "name": "nftables",
-        "epoch": 1,
-        "version": "0.9.3",
-        "release": "26.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/nftables-0.9.3-26.el8.x86_64.rpm",
-        "checksum": "sha256:442e58693d7a5a0ac84e35faa5ae86c2588ae7467918947de118ade0d0673ab8"
-      },
       {
         "name": "npth",
         "epoch": 0,
@@ -14592,15 +14447,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-ethtool-0.14-5.el8.x86_64.rpm",
         "checksum": "sha256:7540cda72b29722509f43e724c6095db62b8f080064ab4d1eccf39537e458c97"
       },
-      {
-        "name": "python3-firewall",
-        "epoch": 0,
-        "version": "0.9.3",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-firewall-0.9.3-13.el8.noarch.rpm",
-        "checksum": "sha256:aa45417d26f9cc35fff19c4d547e7c8eaabfbc72667d716d5b604982e2d704f2"
-      },
       {
         "name": "python3-gobject-base",
         "epoch": 0,
@@ -14754,15 +14600,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-magic-5.33-24.el8.noarch.rpm",
         "checksum": "sha256:028f5d98c3c16a7352fdf78315c61285d51ba886de7494b19ba0d7dac0934d53"
       },
-      {
-        "name": "python3-nftables",
-        "epoch": 1,
-        "version": "0.9.3",
-        "release": "26.el8",
-        "arch": "x86_64",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-nftables-0.9.3-26.el8.x86_64.rpm",
-        "checksum": "sha256:66ea1e3d0bfb3d08a0383cec05f9d51b598ad5fbc528fb980f38688bb7ede8ed"
-      },
       {
         "name": "python3-oauthlib",
         "epoch": 0,
@@ -14898,24 +14735,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-six-1.11.0-8.el8.noarch.rpm",
         "checksum": "sha256:932cca0b2aa28d64538fca0401acc35bec34f14bfe99d3e22ea8452b79890eac"
       },
-      {
-        "name": "python3-slip",
-        "epoch": 0,
-        "version": "0.6.4",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-slip-0.6.4-13.el8.noarch.rpm",
-        "checksum": "sha256:5293624aaec9da3557c32d1c0792a4ec6b2db1a63b77ac2ef3cb283da15490e9"
-      },
-      {
-        "name": "python3-slip-dbus",
-        "epoch": 0,
-        "version": "0.6.4",
-        "release": "13.el8",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-n8.9-20230316/Packages/python3-slip-dbus-0.6.4-13.el8.noarch.rpm",
-        "checksum": "sha256:40c199fa3a31697ae9aa7a2ee1c37539faf7be0fbc81a6216332c77c99927b5c"
-      },
       {
         "name": "python3-sssdconfig",
         "epoch": 0,
@@ -17013,15 +16832,6 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.9-20230316/Packages/xorg-x11-fonts-Type1-7.5-19.el8.noarch.rpm",
         "checksum": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
       },
-      {
-        "name": "rhui-azure-rhel8",
-        "epoch": 0,
-        "version": "2.2",
-        "release": "484",
-        "arch": "noarch",
-        "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-rhui-azure-20230418/Packages/r/rhui-azure-rhel8-2.2-484.noarch.rpm",
-        "checksum": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
-      },
       {
         "name": "eap7-FastInfoset",
         "epoch": 0,
diff --git a/test/data/manifests/rhel_89-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_89-x86_64-azure_rhui-boot.json
index 5d0ed6d18..c6f455a83 100644
--- a/test/data/manifests/rhel_89-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_89-x86_64-azure_rhui-boot.json
@@ -2848,12 +2848,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_89-x86_64-azure_sap_rhui-boot.json b/test/data/manifests/rhel_89-x86_64-azure_sap_rhui-boot.json
index 4b1cb3e5a..ca2de47e3 100644
--- a/test/data/manifests/rhel_89-x86_64-azure_sap_rhui-boot.json
+++ b/test/data/manifests/rhel_89-x86_64-azure_sap_rhui-boot.json
@@ -3500,12 +3500,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }
diff --git a/test/data/manifests/rhel_89-x86_64-vhd-boot.json b/test/data/manifests/rhel_89-x86_64-vhd-boot.json
index f782eb04a..9d3311748 100644
--- a/test/data/manifests/rhel_89-x86_64-vhd-boot.json
+++ b/test/data/manifests/rhel_89-x86_64-vhd-boot.json
@@ -2798,12 +2798,12 @@
             "type": "org.osbuild.systemd",
             "options": {
               "enabled_services": [
-                "firewalld",
                 "nm-cloud-setup.service",
                 "nm-cloud-setup.timer",
                 "sshd",
                 "systemd-resolved",
-                "waagent"
+                "waagent",
+                "firewalld"
               ],
               "default_target": "multi-user.target"
             }