diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml
index 69268ba445..dcb7768be4 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml
@@ -16,12 +16,11 @@
     - ansible_architecture == "x86_64"
   tags: patch_update
 
-- name: Enable EPEL release for RHEL8 or RHEL6 or RHEL7
+- name: Enable EPEL release for RHEL
   yum: name=https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm
   failed_when: false
   when:
     - ansible_architecture != "s390x"
-    - (ansible_distribution_major_version == "8") or (ansible_distribution_major_version == "6") or (ansible_distribution_major_version == "7")
   tags: patch_update
 
 - name: YUM upgrade all packages
@@ -52,11 +51,11 @@
 ##########################
 # Additional build tools #
 ##########################
-- name: Install additional build tools if NOT RHEL 8
+- name: Install additional build tools if NOT RHEL8 and above
   package: "name={{ item }} state=latest"
-  with_items: "{{ Additional_Build_Tools_NOT_RHEL8 }}"
+  with_items: "{{ Additional_Build_Tools_NOT_RHEL8Plus }}"
   when:
-    - (ansible_distribution_major_version != "8")
+    - not (ansible_distribution_major_version | int >= 8)
   tags: build_tools
 
 - name: Install additional build tools for RHEL 7
@@ -102,11 +101,11 @@
     - (ansible_distribution_major_version == "6") or (ansible_distribution_major_version == "7")
   tags: build_tools
 
-- name: Install additional build tools for RHEL 8
+- name: Install additional build tools for RHEL8 and above
   package: "name={{ item }} state=latest"
-  with_items: "{{ Additional_Build_Tools_RHEL8 }}"
+  with_items: "{{ Additional_Build_Tools_RHEL8Plus }}"
   when:
-    - (ansible_distribution_major_version == "8")
+    - (ansible_distribution_major_version | int >= 8)
   tags: build_tools
 
 - name: Install jq for SBoM parsing for build reproducibility testing
@@ -136,17 +135,17 @@
   with_items: "{{ Java_NOT_RHEL6_PPC64 }}"
   when:
     - not (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64")
-    - not (ansible_distribution_major_version == "8")
+    - not (ansible_distribution_major_version | int >= 8)
 
 - name: Install Java when RedHat 6 on ppc64
   package: "name={{ item }} state=latest"
   with_items: "{{ Java_RHEL6_PPC64 }}"
   when: (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64")
 
-- name: Install Java when RedHat 8
+- name: Install Java when RedHat 8 and above
   package: "name={{ item }} state=latest"
-  with_items: "{{ Java_RHEL8 }}"
-  when: (ansible_distribution_major_version == "8")
+  with_items: "{{ Java_RHEL8Plus }}"
+  when: (ansible_distribution_major_version | int >= 8)
 
 ####################
 # Set default Java #
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
index 6022f90a62..cf26c24533 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
@@ -56,12 +56,12 @@ Build_Tool_Packages:
   - xz
   - zip
 
-Additional_Build_Tools_NOT_RHEL8:
+Additional_Build_Tools_NOT_RHEL8Plus:
   - libdwarf-devel                # now in CodeReady Linux Builder (CRB) repo
   - libmpc-devel                  # now in CodeReady Linux Builder (CRB) repo
   - ntp                           # in RHEL8, ntp package is replaced by chrony
 
-Additional_Build_Tools_RHEL8:
+Additional_Build_Tools_RHEL8Plus:
   - glibc-locale-source
   - glibc-langpack-ja             # required for creating Japanese locales
   - glibc-langpack-ko             # required for creating Korean locales
@@ -92,8 +92,8 @@ Additional_Build_Tools_RHEL7_s390x:
   - libstdc++.s390                # a dependency required for executing a 32-bit C binary
   - yum-utils                     # yumdownloader required for devkit creation
 
-Java_RHEL8:
-  - java-1.8.0-openjdk-devel
+Java_RHEL8Plus:
+  - java-21-openjdk-devel
 
 Java_NOT_RHEL6_PPC64:             # Not RHEL8 either
   - java-1.7.0-openjdk-devel