From ff74cf29f6136adef0c86de79a33c6c98c9e522c Mon Sep 17 00:00:00 2001
From: sean-freeman <1815807+sean-freeman@users.noreply.github.com>
Date: Sat, 27 Apr 2024 00:46:02 +0100
Subject: [PATCH] all: update ibmcloud powervs os image regex

---
 deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml     | 1 -
 .../sap_bw4hana_standard_scaleout/ansible_extravars.yml        | 3 ++-
 deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml    | 3 ++-
 deploy_scenarios/sap_hana/ansible_extravars.yml                | 3 ++-
 deploy_scenarios/sap_hana_ha/ansible_extravars.yml             | 3 ++-
 deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml       | 3 ++-
 .../sap_ides_ecc_hana_sandbox/ansible_extravars.yml            | 3 ++-
 .../sap_landscape_s4hana_standard/ansible_extravars.yml        | 3 ++-
 .../ansible_extravars.yml                                      | 3 ++-
 .../sap_nwas_abap_hana_sandbox/ansible_extravars.yml           | 3 ++-
 deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml  | 3 ++-
 .../sap_s4hana_distributed_ha/ansible_extravars.yml            | 3 ++-
 .../sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml  | 3 ++-
 .../sap_s4hana_distributed_maintplan/ansible_extravars.yml     | 3 ++-
 .../sap_s4hana_foundation_sandbox/ansible_extravars.yml        | 3 ++-
 .../sap_s4hana_foundation_standard/ansible_extravars.yml       | 3 ++-
 deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml      | 3 ++-
 .../sap_s4hana_sandbox_maintplan/ansible_extravars.yml         | 3 ++-
 deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml     | 3 ++-
 .../sap_s4hana_standard_maintplan/ansible_extravars.yml        | 3 ++-
 .../sap_webdispatcher_standalone/ansible_extravars.yml         | 3 ++-
 21 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml
index 1901fc6..c076056 100755
--- a/deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml
+++ b/deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml
@@ -613,7 +613,6 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-4: ".*SLES.*15.*4"
   sles-15-5: ".*SLES.*15.*5"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
   rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
   rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml
index 080e81f..b3ff09f 100755
--- a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml
+++ b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml
@@ -700,8 +700,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml
index e59e71b..b7d7bba 100755
--- a/deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml
+++ b/deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml
@@ -646,8 +646,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_hana/ansible_extravars.yml b/deploy_scenarios/sap_hana/ansible_extravars.yml
index 3c985d8..55ec28c 100755
--- a/deploy_scenarios/sap_hana/ansible_extravars.yml
+++ b/deploy_scenarios/sap_hana/ansible_extravars.yml
@@ -412,8 +412,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_hana_ha/ansible_extravars.yml b/deploy_scenarios/sap_hana_ha/ansible_extravars.yml
index e7f0dbf..a03e014 100755
--- a/deploy_scenarios/sap_hana_ha/ansible_extravars.yml
+++ b/deploy_scenarios/sap_hana_ha/ansible_extravars.yml
@@ -628,8 +628,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml b/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml
index 6aaad18..c23fcb4 100755
--- a/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml
+++ b/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml
@@ -406,8 +406,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml
index 16baaa1..e1ecd06 100755
--- a/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml
+++ b/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml
@@ -527,8 +527,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_landscape_s4hana_standard/ansible_extravars.yml b/deploy_scenarios/sap_landscape_s4hana_standard/ansible_extravars.yml
index 6a9d85a..ffc579b 100755
--- a/deploy_scenarios/sap_landscape_s4hana_standard/ansible_extravars.yml
+++ b/deploy_scenarios/sap_landscape_s4hana_standard/ansible_extravars.yml
@@ -2003,8 +2003,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_extravars.yml
index 35e05f0..4669d56 100755
--- a/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_extravars.yml
+++ b/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_extravars.yml
@@ -1501,8 +1501,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_extravars.yml
index f9bcfa2..09e702c 100755
--- a/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_extravars.yml
+++ b/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_extravars.yml
@@ -608,8 +608,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml
index 7a9fb6b..03868cc 100755
--- a/deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml
@@ -2285,8 +2285,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_s4hana_distributed_ha/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_distributed_ha/ansible_extravars.yml
index 31cc451..57fe76b 100755
--- a/deploy_scenarios/sap_s4hana_distributed_ha/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_distributed_ha/ansible_extravars.yml
@@ -2835,8 +2835,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml
index a3ecaef..fa17359 100755
--- a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml
@@ -1984,8 +1984,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_extravars.yml
index 8a562a9..ba21b6b 100755
--- a/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_extravars.yml
@@ -1634,8 +1634,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_extravars.yml
index ae82869..997eb99 100755
--- a/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_extravars.yml
@@ -702,8 +702,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_s4hana_foundation_standard/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_foundation_standard/ansible_extravars.yml
index ce8da46..b761cc0 100755
--- a/deploy_scenarios/sap_s4hana_foundation_standard/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_foundation_standard/ansible_extravars.yml
@@ -819,8 +819,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml
index bc8766a..3ab3a87 100755
--- a/deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml
@@ -1057,8 +1057,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_extravars.yml
index 253b462..9203adc 100755
--- a/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_extravars.yml
@@ -626,8 +626,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml
index c64f59d..5e2f911 100755
--- a/deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml
@@ -1193,8 +1193,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_extravars.yml
index 98862a1..5f1b7eb 100755
--- a/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_extravars.yml
+++ b/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_extravars.yml
@@ -702,8 +702,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $
diff --git a/special_actions/sap_webdispatcher_standalone/ansible_extravars.yml b/special_actions/sap_webdispatcher_standalone/ansible_extravars.yml
index d6c601d..39487ae 100755
--- a/special_actions/sap_webdispatcher_standalone/ansible_extravars.yml
+++ b/special_actions/sap_webdispatcher_standalone/ansible_extravars.yml
@@ -439,8 +439,9 @@ sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary:
   rhel-9-2: ".*RHEL.*9.*2"
   sles-15-3: ".*SLES.*15.*3"
   sles-15-4: ".*SLES.*15.*4"
-  rhel-8-4-sap-ha: ".*RHEL.*8.*4.*SAP$" # ensure string suffix using $
   rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $
+  rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $
+  rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $
   sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $
   sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $
   sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $