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 f0309d2eda..ad0c0d71d7 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml
@@ -21,7 +21,7 @@
   failed_when: false
   when:
     - ansible_architecture != "s390x"
-    - (ansible_distribution_major_version == "9") or (ansible_distribution_major_version == "8") or (ansible_distribution_major_version == "6") or (ansible_distribution_major_version == "7")
+    - (ansible_distribution_major_version | int >= 6)
   tags: patch_update
 
 - name: YUM upgrade all packages
@@ -56,7 +56,7 @@
   package: "name={{ item }} state=latest"
   with_items: "{{ Additional_Build_Tools_NOT_RHEL8 }}"
   when:
-    - (ansible_distribution_major_version != "8" and ansible_distribution_major_version != "9")
+    - not (ansible_distribution_major_version | int >= 8)
   tags: build_tools
 
 - name: Install additional build tools for RHEL 7
@@ -136,7 +136,7 @@
   with_items: "{{ Java_NOT_RHEL6_PPC64 }}"
   when:
     - not (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64")
-    - not (ansible_distribution_major_version == "8" or ansible_distribution_major_version == "9" )
+    - not (ansible_distribution_major_version | int >= 8)
 
 - name: Install Java when RedHat 6 on ppc64
   package: "name={{ item }} state=latest"
@@ -146,7 +146,7 @@
 - name: Install Java when RedHat 8 and RedHat 9
   package: "name={{ item }} state=latest"
   with_items: "{{ Java_RHEL8 }}"
-  when: (ansible_distribution_major_version == "8" or ansible_distribution_major_version == "9")
+  when: (ansible_distribution_major_version | int >= 8)
 
 ####################
 # Set default Java #