diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
index a813e75692..86bed92b30 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
@@ -79,9 +79,9 @@
 
 - name: Install additional build tools when NOT CentOS8+
   package: "name={{ item }} state=latest"
-  with_items: "{{ Additional_Build_Tools_NOT_CentOS8_CentOS9Stream }}"
+  with_items: "{{ Additional_Build_Tools_NOT_CentOS8plus }}"
   when:
-    - ansible_distribution_major_version|int < 8
+    - ansible_distribution_major_version | int < 8
   tags: build_tools
 
 - name: Install additional test tools for CentOS 10+ e.g. weston
@@ -157,8 +157,7 @@
   package: "name=centos-release-scl state=latest"
   when:
     - ansible_architecture == "x86_64"
-    - ansible_distribution_major_version != "8"
-    - ansible_distribution_major_version != "9"
+    - ansible_distribution_major_version | int < 8
   tags: build_tools
 
 - name: Sed change the baseurl for CentOS SCL (CentOS6)
@@ -208,11 +207,12 @@
     - ansible_architecture == "x86_64" and ansible_distribution_major_version == "7"
   tags: build_tools
 
-- name: Install additional build tools for CentOS on x86
+- name: Install additional build tools for CentOS on x86 for EL<10 (Not 32-bit support)
   package: "name={{ item }} state=latest"
   with_items: "{{ Additional_Build_Tools_CentOS_x86 }}"
   when:
     - ansible_architecture == "x86_64"
+    - ansible_distribution_major_version | int < 10
   tags: build_tools
 
 - name: Create symlink for /opt/rh/devtoolset-2/root/usr/bin/gcc to gcc
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
index 26f70d8b50..06be7367c5 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
@@ -82,7 +82,7 @@ Additional_Build_Tools_CentOS8_Plus:
   - ccache
   - procps-ng
 
-Additional_Build_Tools_NOT_CentOS8_CentOS9Stream:
+Additional_Build_Tools_NOT_CentOS8plus:
   - lbzip2
   - java-1.7.0-openjdk-devel
   - java-1.8.0-openjdk-devel
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
index 46033be49a..d043c2d669 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/nasm/tasks/main.yml
@@ -90,7 +90,7 @@
     - (nasm_installed.rc is defined) and ((nasm_installed.rc != 0 ) or (nasm_installed.rc == 0 and nasm.stdout is version_compare(nasm_version, operator='ne')))
   tags: nasm
 
-- name: Running ./configure & make for nasm ( Not Ubuntu 22+ and not Fedora 35+ )
+- name: Running ./configure & make for nasm ( Not Ubuntu 22+ and not Fedora 35+ based distros )
   shell: cd /tmp/nasm-{{ nasm_version }} && CC={{ CC }} && ./configure -prefix=/usr/local && make install
   environment:
     CC: "{{ CC }}"
@@ -98,6 +98,7 @@
     - (ansible_distribution != "Ubuntu") or (ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int < 22)
     - (ansible_distribution != "Fedora") or (ansible_distribution == "Fedora" and ansible_distribution_major_version | int < 35)
     - (ansible_distribution != "RedHat") or (ansible_distribution == "RedHat" and ansible_distribution_major_version | int < 10)
+    - (ansible_distribution != "CentOS") or (ansible_distribution == "CentOS" and ansible_distribution_major_version | int < 10)
     - nasm_installed.rc is defined
     - (nasm_installed.rc != 0 or (nasm_installed.rc == 0 and nasm.stdout is version_compare(nasm_version, operator='ne')))
   tags: nasm