diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec
index 57130c9..c7e8879 100644
--- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec
@@ -6,7 +6,7 @@
 
 Name:           cloud-init
 Version:        22.1
-Release:        8%{?dist}.inferit
+Release:        8%{?dist}.1.inferit
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
@@ -171,7 +171,27 @@ if [ $1 -eq 1 ] ; then
     /bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || :
     /bin/systemctl enable cloud-init.target        >/dev/null 2>&1 || :
 elif [ $1 -eq 2 ]; then
-    # Upgrade. If the upgrade is from a version older than 0.7.9-8,
+    # Upgrade
+    # RHBZ 2210012 - check for null ssh_genkeytypes value in cloud.cfg that
+    # breaks ssh connectivity after upgrade to a newer version of cloud-init.
+    if [ -f  %{_sysconfdir}/cloud/cloud.cfg.rpmnew ] && grep -q '^\s*ssh_genkeytypes:\s*~\s*$'  %{_sysconfdir}/cloud/cloud.cfg ; then
+       echo "***********************************************"
+       echo "*** WARNING!!!! ***"
+       echo ""
+       echo "ssh_genkeytypes set to null in /etc/cloud/cloud.cfg!"
+       echo "SSH access might be broken after reboot. Please check the following KCS"
+       echo "for more detailed information:"
+       echo ""
+       echo "https://access.redhat.com/solutions/6988034"
+       echo ""
+       echo "Please reconcile the differences between /etc/cloud/cloud.cfg and "
+       echo "/etc/cloud/cloud.cfg.rpmnew and update ssh_genkeytypes configuration in "
+       echo "/etc/cloud/cloud.cfg to a list of keytype values, something like:"
+       echo "ssh_genkeytypes:  ['rsa', 'ecdsa', 'ed25519']"
+       echo ""
+       echo "************************************************"
+    fi
+    # If the upgrade is from a version older than 0.7.9-8,
     # there will be stale systemd config
     /bin/systemctl is-enabled cloud-config.service >/dev/null 2>&1 &&
       /bin/systemctl reenable cloud-config.service >/dev/null 2>&1 || :
@@ -240,11 +260,13 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
-* Thu Aug 31 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 22.1-8.inferit
-- Added support for MSVSphere (patch by Evgeny Zamriy for 9.2 adapted to 8.8)
-- Rebuilt for MSVSphere 8.8
+* Mon Jul 03 2023 Miroslav Rezanina <mrezanin@redhat.com> - 22.1-8.el8_8.1
+- ci-Add-warning-during-upgrade-from-an-old-version-with-.patch [bz#2217064]
+- Resolves: bz#2217064
+  ([cloud-init] System didn't generate ssh host keys and lost ssh connection after cloud-init removed them with updated cloud-init package. [rhel-8.8.0.z])
 
-* Tue Jul 25 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 22.1-8
+* Tue Jan 31 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 22.1-8.inferit
+- Added support for MSVSphere (patch by Evgeny Zamriy for 9.2 adapted to 8.8)
 - Rebuilt for MSVSphere 8.8
 
 * Mon Jan 30 2023 Camilla Conte <cconte@redhat.com> - 22.1-8