diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml
index 5bcfd453af..60c7789130 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml
@@ -31,11 +31,11 @@
 
 - name: Install JDK for x64
   when: ansible_architecture == "x86_64"
+  tags: build_tools
   block:
     - name: Check if zulu-7 is already installed in the target location
       stat: path=/usr/lib/jvm/zulu7
       register: zulu7_installed
-      tags: build_tools
 
     - name: Install latest zulu-7 release if not already installed
       unarchive:
@@ -44,7 +44,6 @@
         remote_src: yes
       when:
         - not zulu7_installed.stat.exists
-      tags: build_tools
 
     - name: Create symlink to point at zulu-7
       file:
@@ -53,12 +52,10 @@
         state: link
       when:
         - not zulu7_installed.stat.exists
-      tags: build_tools
 
     - name: Check if zulu-14 is already installed in the target location
       stat: path=/usr/lib/jvm/zulu14
       register: zulu14_installed
-      tags: build_tools
 
     - name: Install latest zulu-14 release if not already installed
       unarchive:
@@ -67,7 +64,6 @@
         remote_src: yes
       when:
         - not zulu14_installed.stat.exists
-      tags: build_tools
 
     - name: Create symlink to point at zulu-14
       file:
@@ -76,12 +72,10 @@
         state: link
       when:
         - not zulu14_installed.stat.exists
-      tags: build_tools
 
     - name: Check if zulu-15 is already installed in the target location
       stat: path=/usr/lib/jvm/zulu15
       register: zulu15_installed
-      tags: build_tools
 
     - name: Install latest zulu-15 release if not already installed
       unarchive:
@@ -90,7 +84,6 @@
         remote_src: yes
       when:
         - not zulu15_installed.stat.exists
-      tags: build_tools
 
     - name: Create symlink to point at zulu-15
       file:
@@ -99,7 +92,6 @@
         state: link
       when:
         - not zulu15_installed.stat.exists
-      tags: build_tools
 
 - name: Install JDK for aarch64
   when: ansible_architecture == "aarch64"
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 2aa545141a..20ef0e00b1 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
@@ -11,6 +11,7 @@
 - name: Check For Centos8 Stream
   shell: cat /etc/centos-release
   register: relfile_contents
+  tags: build_tools
 
 - name: Enable EPEL release (not CentOS8)
   yum:
@@ -136,7 +137,6 @@
     - ansible_distribution_major_version == "6"
   tags: build_tools
 
-
 - name: Install CentOS SCL x86_64 repo for gcc7.3
   package: "name=centos-release-scl state=latest"
   when:
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml
index c1ca42f8ce..0da1c4dbed 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml
@@ -8,6 +8,7 @@
 #########################################
 - name: Allow https apt sources
   package: "name=apt-transport-https state=latest"
+  tags: patch_update
 
 - name: Add the openjdk repository to apt for openjdk7
   apt_repository: repo='ppa:openjdk-r/ppa' update_cache=no
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml
index 15bc519c2d..e81cb80544 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml
@@ -124,21 +124,25 @@
     - not (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64")
     - not (ansible_distribution_major_version == "8")
     - not (ansible_distribution_major_version == "35" and ansible_distribution == "Fedora")
+  tags: install_java
 
 - 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")
+  tags: install_java
 
 - name: Install Java when RedHat 8
   package: "name={{ item }} state=latest"
   with_items: "{{ Java_RHEL8 }}"
   when: (ansible_distribution_major_version == "8")
+  tags: install_java
 
 - name: Install Java when Fedora 35
   package: "name={{ item }} state=latest"
   with_items: "{{ Java_FED35 }}"
   when: (ansible_distribution_major_version == "35" and ansible_distribution != "Fedora")
+  tags: install_java
 
 ####################
 # Set default Java #
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..11a8aa4d87 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml
@@ -137,16 +137,19 @@
   when:
     - not (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64")
     - not (ansible_distribution_major_version == "8")
+  tags: install_java
 
 - 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")
+  tags: install_java
 
 - name: Install Java when RedHat 8
   package: "name={{ item }} state=latest"
   with_items: "{{ Java_RHEL8 }}"
   when: (ansible_distribution_major_version == "8")
+  tags: install_java
 
 ####################
 # Set default Java #
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml
index 71cc7ab63b..3de6fa65a0 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml
@@ -87,14 +87,13 @@
 
 - name: Install Git SLES 12 SP5
   when: (ansible_distribution_major_version == "12" and ansible_distribution_version == "12.5")
+  tags: build_tools
   block:
     - name: Test if  Git Is Installed At /usr/local/bin
       shell: /usr/local/bin/git --version >/dev/null
       failed_when: false
       register: git_installed
       changed_when: false
-      tags:
-        - build_tools
 
     - name: Test if git is installed at the correct version
       shell: /usr/local/bin/git --version | sed -e 's/git version //g' | awk -F'[.]' '{print $1 "." $2}'
@@ -102,8 +101,6 @@
         - git_installed.rc == 0
       register: git_version
       changed_when: false
-      tags:
-        - build_tools
 
     - name: Get Git Source
       get_url:
@@ -120,8 +117,6 @@
         chdir: /tmp
       when:
         - (git_installed.rc != 0) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.31', operator='lt'))
-      tags:
-        - build_tools
 
     - name: Compile Git 2.31.0
       shell: |
@@ -131,8 +126,6 @@
         gmake install
       when:
         - (git_installed.rc != 0) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.31', operator='lt'))
-      tags:
-        - build_tools
 
 - name: Install additional build tools for SLES 11
   package: "name={{ item }} state=latest"
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml
index 171cbc67d2..37ffdfd28b 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml
@@ -118,12 +118,14 @@
   with_items: "{{ Additional_Packages_Ubuntu16 }}"
   when:
     - ansible_distribution_major_version == "16"
+  tags: test_tools
 
 - name: Install additional Packages specific to Ubuntu 18
   package: "name={{ item }} state=latest"
   with_items: "{{ Additional_Packages_Ubuntu18 }}"
   when:
     - ansible_distribution_major_version == "18"
+  tags: test_tools
 
 - name: Download LibFFI6 v3.2.1_8 For Ubuntu 20 or 22 on S390X
   get_url:
@@ -135,12 +137,14 @@
   when:
     - (ansible_distribution_major_version == "20" and ansible_architecture == "s390x") or
       (ansible_distribution_major_version == "22" and ansible_architecture == "s390x")
+  tags: test_tools
 
 - name: Install LibFFI6 v3.2.1_8 For Ubuntu 20 or 22 on S390X
   apt: deb="/tmp/libffi6_3.2.1-8_s390x.deb"
   when:
     - (ansible_distribution_major_version == "20" and ansible_architecture == "s390x") or
       (ansible_distribution_major_version == "22" and ansible_architecture == "s390x")
+  tags: test_tools
 
 ####################
 # Set default Java #