diff --git a/internal/distro/rhel8/azure.go b/internal/distro/rhel8/azure.go
index f96df6b7c..ded3782ce 100644
--- a/internal/distro/rhel8/azure.go
+++ b/internal/distro/rhel8/azure.go
@@ -249,6 +249,9 @@ func azureSapPackageSet(t *imageType) rpmmd.PackageSet {
 
 func azureEapPackageSet(t *imageType) rpmmd.PackageSet {
 	return rpmmd.PackageSet{
+		Include: []string{
+			"rhui-azure-rhel8",
+		},
 		Exclude: []string{
 			"firewalld",
 		},
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 33684e3c0..8c1536d39 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
@@ -2544,6 +2544,9 @@
                   {
                     "id": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
                   },
+                  {
+                    "id": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
+                  },
                   {
                     "id": "sha256:ca3e0ec3842accbc0b801561a716708261f7fac32fcccaa6bf70bd862739aa67",
                     "options": {
@@ -6969,6 +6972,9 @@
           "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"
           },
@@ -16832,6 +16838,15 @@
         "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_86-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-azure_eap7_rhui-boot.json
index 62f55b76a..6e0731dda 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
@@ -2550,6 +2550,9 @@
                   {
                     "id": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
                   },
+                  {
+                    "id": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
+                  },
                   {
                     "id": "sha256:ca3e0ec3842accbc0b801561a716708261f7fac32fcccaa6bf70bd862739aa67",
                     "options": {
@@ -7035,6 +7038,9 @@
           "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"
           },
@@ -16862,6 +16868,15 @@
         "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_87-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-azure_eap7_rhui-boot.json
index e9635a3f7..87508775d 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
@@ -2544,6 +2544,9 @@
                   {
                     "id": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
                   },
+                  {
+                    "id": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
+                  },
                   {
                     "id": "sha256:ca3e0ec3842accbc0b801561a716708261f7fac32fcccaa6bf70bd862739aa67",
                     "options": {
@@ -6969,6 +6972,9 @@
           "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"
           },
@@ -16832,6 +16838,15 @@
         "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_88-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_88-x86_64-azure_eap7_rhui-boot.json
index f19204ae8..b66305345 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
@@ -2544,6 +2544,9 @@
                   {
                     "id": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
                   },
+                  {
+                    "id": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
+                  },
                   {
                     "id": "sha256:ca3e0ec3842accbc0b801561a716708261f7fac32fcccaa6bf70bd862739aa67",
                     "options": {
@@ -7005,6 +7008,9 @@
           "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"
           },
@@ -16832,6 +16838,15 @@
         "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_89-x86_64-azure_eap7_rhui-boot.json b/test/data/manifests/rhel_89-x86_64-azure_eap7_rhui-boot.json
index 9e65e51e5..239b55e60 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
@@ -2541,6 +2541,9 @@
                   {
                     "id": "sha256:c457303288fd423f9f320f3a05bc5a592455a75f14ea76db3a482633e59137ae"
                   },
+                  {
+                    "id": "sha256:334ac6137a78b2d57afb209804d1ae2374d7b877aa12ef85d02aa6487e496140"
+                  },
                   {
                     "id": "sha256:ca3e0ec3842accbc0b801561a716708261f7fac32fcccaa6bf70bd862739aa67",
                     "options": {
@@ -6972,6 +6975,9 @@
           "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-20230615/Packages/libpsl-0.20.2-6.el8.x86_64.rpm"
           },
@@ -16817,6 +16823,15 @@
         "remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-n8.9-20230615/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,