diff --git a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml
index 397c3cadc2..0c4faba35d 100644
--- a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml
@@ -17,8 +17,10 @@
       - '8'
       - '10'
       - '11'
+      - '16'
       - '17'
       - '20'
+      - '21'
 
 - name: Set /usr/java8_64 as default
   file:
diff --git a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml
index 5ae3501cf6..c8c5bde396 100644
--- a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml
+++ b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml
@@ -7,10 +7,10 @@
     os_img: "aix/ppc64/jdk"
     heap: "normal"
     impl: "hotspot"
-    new_baseurl: "https://api.adoptium.net/v3/binary/latest"
-    new_vendor: "eclipse"
-    baseurl: "https://api.adoptopenjdk.net/v3/binary/latest"
-    vendor: "adoptopenjdk"
+    adoptium_baseurl: "https://api.adoptium.net/v3/binary/latest"
+    adoptium_vendor: "eclipse"
+    adoptopenjdk_baseurl: "https://api.adoptopenjdk.net/v3/binary/latest"
+    adoptopenjdk_vendor: "adoptopenjdk"
     project: "{{ heap }}/{{ vendor }}?project=jdk"
   block:
     - name: Verify space in /usr
@@ -21,9 +21,35 @@
         path: /usr/java{{ jdk }}_64
       register: java_installed
 
+    - name: Download JDK {{ jdk }} binary from api.adoptopenjdk.net
+      get_url:
+        url: "{{ adoptopenjdk_baseurl }}/{{ jdk }}/ga/{{ os_img }}/{{ impl }}/{{ adoptopenjdk_project }}"
+        dest: /tmp/jdk{{ jdk }}.tar.gz
+        mode: 0440
+        timeout: 25
+      retries: 3
+      delay: 5
+      when:
+        - java_installed.stat.isdir is not defined
+        - ! ( jdk == 8 or jdk == 11 or jdk >= 17 )
+      register: openjdk
+
+    - name: Download JDK {{ jdk }} binary from api.adoptium.net
+      get_url:
+        url: "{{ adoptium_baseurl }}/{{ jdk }}/ga/{{ os_img }}/{{ impl }}/{{ adoptium_project }}"
+        dest: /tmp/jdk{{ jdk }}.tar.gz
+        mode: 0440
+        timeout: 25
+      retries: 3
+      delay: 5
+      when:
+        - java_installed.stat.isdir is not defined
+        - jdk == 8 or jdk == 11 or jdk >= 17
+      register: openjdk
+
     - name: Download JDK {{ jdk }} binary
       get_url:
-        url: "{{ baseurl }}/{{ jdk }}/ga/{{ os_img }}/{{ impl }}/{{ project }}"
+        url: "{{ adoptopenjdk_baseurl }}/{{ jdk }}/ga/{{ os_img }}/{{ impl }}/{{ project }}"
         dest: /tmp/jdk{{ jdk }}.tar.gz
         mode: 0440
         timeout: 25
@@ -31,6 +57,7 @@
       delay: 5
       when:
         - java_installed.stat.isdir is not defined
+        - jdk < 17
       register: openjdk
 
     - name: Get Signature File Link
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
index 40e0619c60..a0e0a43304 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
@@ -117,6 +117,8 @@
         - ansible_distribution != "Alpine"
         - ansible_distribution != "Solaris"
         - ansible_architecture != "riscv64"
+        - ansible_architecture != "s390x"
+        - ansible_architecture != "armv7l"
       tags: build_tools
     - role: adoptopenjdk_install  # JDK22 Build Bootstrap
       jdk_version: 21
diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
index 8f0eeecf2f..aa6b5ff5af 100644
--- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
@@ -62,10 +62,10 @@
       jdk_version: 11
     - role: Java_install          # Latest LTS, for use by agents
       jdk_version: 17
-    - role: Java_install          # Bootstrap for JDK20
-      jdk_version: 19
     - role: Java_install          # Bootstrap for JDK21
       jdk_version: 20
+    - role: Java_install          # Latest LTS, for use by agents
+      jdk_version: 21
     - ANT                         # Testing
     - role: MSVS_2013
       when: ansible_architecture == "64-bit"