diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
index b6402a8823..36c80f37c2 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
@@ -28,123 +28,12 @@
     - role: Get_Vendor_Files
       tags: [vendor_files, adoptopenjdk, jenkins_user, nagios_plugins, superuser]
     - Version
-    - adopt_etc
-    - role: CentOS6-Cent7SSL
-      when: ((ansible_distribution == "RedHat" or ansible_distribution == "CentOS") and ansible_distribution_major_version == "6" and ansible_architecture == "x86_64")
-    - Common
-    - Python2.7                   # CentOS6
-    - Providers                   # AdoptOpenJDK Infrastructure
-    - autoconf
-    - curl
     - Jenkins_User                # AdoptOpenJDK Infrastructure
-#  - role: freemarker            # OpenJ9
-#      tags: [build_tools, build_tools_openj9]
-    - role: macos_codesign
-      tags: [adoptopenjdk, codesign]
-      when: ansible_distribution == "MacOSX"
-    - ant                         # Testing
-    - Ant-Contrib                 # Testing
-    - maven                       # Testing
-    - role: GIT_Source
-      when: ansible_distribution != "Solaris" # Compile fails on Solaris
-    - gmake
-    - Docker                      # Testing
-    - role: NVidia_Cuda_Toolkit   # OpenJ9
-      tags: [build_tools, build_tools_openj9]
-    - Superuser                   # AdoptOpenJDK Infrastructure
-    - role: Swap_File
-      when:
-        - ansible_distribution != "MacOSX"
-        - ansible_distribution != "Solaris" # These steps fail on Solaris
-      tags: adoptopenjdk
-    - role: Crontab
-      when:
-        - ansible_distribution != "MacOSX"
-      tags: adoptopenjdk
-    - role: NTP_TIME
-      when: ansible_distribution != "MacOSX"
-    - gcc_48
-    - role: gcc_7                 # OpenJ9
-      tags: [build_tools, build_tools_openj9]
-    - role: gcc_9                 # Dragonwell
-      tags: [build_tools]
-    - role: gcc_10                # JDK17+
-      tags: [build_tools]
-    - role: gcc_11                # JDK19+
-      tags: [build_tools]
-    - role: Xcode
-      when: ansible_distribution == "MacOSX"
-    - role: Xcode11
-      when: ansible_distribution == "MacOSX" and ansible_architecture == "arm64"
-      tags: [xcode11]
-    - role: cmake                 # OpenJ9 / OpenJFX
-      when: ansible_distribution != "Solaris" # Compile fails on Solaris
-      tags: [build_tools, build_tools_openj9, build_tools_openjfx]
-    - role: capstone
-      tags: [build_tools]
-    - role: ccache
-      when: ansible_distribution != "Solaris" # Compile fails on Solaris
-    - role: nasm                  # OpenJ9
-      when: ansible_architecture == 'x86_64'
-      tags: [build_tools, build_tools_openj9]
-    - role: zulu7                 # JDK8 Build Bootstrap
-      when: ansible_distribution != "MacOSX"
-    - role: adoptopenjdk_install
-      jdk_version: 8
-      when:
-        - (ansible_distribution != "Alpine" or ansible_architecture != "aarch64")
-        - ansible_architecture != "riscv64"
-      tags: build_tools
-    - role: adoptopenjdk_install  # JDK11 Build Bootstrap
-      jdk_version: 10
-      when:
-        - ansible_distribution != "Alpine"
-        - ansible_distribution != "Solaris"
-        - ansible_architecture != "riscv64"
-      tags: build_tools
-    - role: adoptopenjdk_install  # JDK11 is LTS and likely still relied on by some agents
-      jdk_version: 11
-      when:
-        - (ansible_distribution != "Alpine" or ansible_architecture != "aarch64")
-        - ansible_distribution != "Solaris"
-        - ansible_architecture != "riscv64"
-      tags: build_tools
     - role: adoptopenjdk_install  # Previous LTS
       jdk_version: 17
       when:
         - ansible_distribution != "Solaris"
       tags: build_tools
-    - role: adoptopenjdk_install  # JDK19 Build Bootstrap
-      jdk_version: 18
-      when:
-        - ansible_distribution != "Alpine"
-        - ansible_distribution != "Solaris"
-        - ansible_architecture != "riscv64"
-      tags: build_tools
-    - role: adoptopenjdk_install  # JDK20 Build Bootstrap
-      jdk_version: 19
-      when:
-        - ansible_distribution != "Alpine"
-        - ansible_distribution != "Solaris"
-      tags: build_tools
-    - role: adoptopenjdk_install  # Current LTS
-      jdk_version: 21
-      when:
-        - ansible_architecture == "riscv64"
-      tags: build_tools
-    - role: Nagios_Plugins        # AdoptOpenJDK Infrastructure
-      tags: [nagios_plugins, adoptopenjdk]
-    - role: Nagios_Master_Config  # AdoptOpenJDK Infrastructure
-      tags: [nagios_master_config, adoptopenjdk]
-    - role: Nagios_Tunnel         # AdoptOpenJDK Infrastructure
-      tags: [nagios_tunnel, adoptopenjdk]
-    - riscv_cross_compiler        # For building JDK11/J9 on RISC-V architecture
-    - Clean_Up
-    - Security
-    - Vendor
-    - IPv6
-    - role: disable_gui
-      tags: adoptopenjdk
     - role: logs
       position: "End"
       tags: always