diff --git a/edk2-ovmf-amdsev.json b/edk2-ovmf-amdsev.json
index a5fbf85..a6549aa 100644
--- a/edk2-ovmf-amdsev.json
+++ b/edk2-ovmf-amdsev.json
@@ -15,7 +15,9 @@
         {
             "architecture": "x86_64",
             "machines": [
-                "pc-q35-rhel8.5.0"
+                "pc-q35-rhel8.5.0",
+                "pc-q35-rhel8.6.0",
+                "pc-q35-rhel9.*"
             ]
         }
     ],
diff --git a/edk2-ovmf-cc.json b/edk2-ovmf-cc.json
index 2e52745..fe6b2a6 100644
--- a/edk2-ovmf-cc.json
+++ b/edk2-ovmf-cc.json
@@ -18,7 +18,9 @@
         {
             "architecture": "x86_64",
             "machines": [
-                "pc-q35-rhel8.5.0"
+                "pc-q35-rhel8.5.0",
+                "pc-q35-rhel8.6.0",
+                "pc-q35-rhel9.*"
             ]
         }
     ],
diff --git a/edk2.spec b/edk2.spec
index e1682a2..b47966d 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -24,7 +24,7 @@ ExclusiveArch: x86_64 aarch64
 
 Name:       edk2
 Version:    %{GITDATE}git%{GITCOMMIT}
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    UEFI firmware for 64-bit virtual machines
 License:    BSD-2-Clause-Patent and OpenSSL and MIT
 URL:        http://www.tianocore.org
@@ -528,6 +528,11 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep '^/lib/modules/[^/]+/vmlinuz$')
 
 
 %changelog
+* Fri Jun 24 2022 Miroslav Rezanina <mrezanin@redhat.com> - 20220526git16779ede2d36-2
+- edk2-OvmfPkg-Update-target-machines-config.patch [bz#2090752]
+- Resolves: bz#2090752
+  (Add RHEL 8.5, 8,6 and 9.x machine types to firmware descriptor files 50-edk2-ovmf-{amdsev,cc}.json)
+
 * Mon Jun 13 2022 Miroslav Rezanina <mrezanin@redhat.com> - 20220526git16779ede2d36-1
 - Rebase to edk2-stable-202205 [bz#2074831]
 - Resolves: bz#2074831