diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
index 7ac31394a2..ecc8a89806 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
@@ -65,13 +65,17 @@
       when: ansible_distribution != "MacOSX"
     - gcc_48
     - role: gcc_7                 # OpenJ9
+      when: ansible_architecture != "riscv64"
       tags: [build_tools, build_tools_openj9]
     - role: gcc_9                 # Dragonwell
       tags: [build_tools]
+      when: ansible_architecture != "riscv64"
     - role: gcc_10                # JDK17+
       tags: [build_tools]
+      when: ansible_architecture != "riscv64"
     - role: gcc_11                # JDK19+
       tags: [build_tools]
+      when: ansible_architecture != "riscv64"
     - role: Xcode
       when: ansible_distribution == "MacOSX"
       tags: [build_tools, xcode, adoptopenjdk]
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 5525a6a750..5f359c3552 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml
@@ -131,6 +131,13 @@
 ####################
 # Set default Java #
 ####################
+
+- name: Install 'openjdk-8-jdk' package
+  package:
+    name: locales
+    state: present
+  when: ansible_architecture != "riscv64"
+
 - name: Set default java version for x86_64
   alternatives:
     name: java
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml
index 2b44b2f6bf..d43664060c 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml
@@ -41,7 +41,6 @@ Build_Tool_Packages:
   - libxtst-dev
   - make
   - ntp
-  - openjdk-8-jdk
   - pigz
   - pkg-config
   - systemtap-sdt-dev
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml
index 712e3b4585..1ebe6f0bb0 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/main.yml
@@ -45,7 +45,15 @@
           - docker-ce
         state: latest   # TODO: Package installs should not use latest
         use: auto       # automatic select package manager to use yum, apt and so on
-      when: ((ansible_distribution == "RedHat" or ansible_distribution == "CentOS") and (ansible_distribution_major_version >= "7")) or (ansible_distribution == "Ubuntu" or ansible_distribution == "Debian")
+      when: ((ansible_distribution == "RedHat" or ansible_distribution == "CentOS") and (ansible_distribution_major_version >= "7")) or ((ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int < 20) or ansible_distribution == "Debian")
+
+    - name: Install default docker on Ubuntu 22+
+      package:
+        name:
+          - docker.io
+        state: latest   # TODO: Package installs should not use latest
+        use: auto       # automatic select package manager to use yum, apt and so on
+      when: ((ansible_distribution == "Ubuntu" and ansible_distribution_major_version | int >= 20) or ansible_distribution == "Debian")
 
     - name: Install for SLES15 # zypper does not support in package module
       include_tasks: sles.yml
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/ubuntu.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/ubuntu.yml
index f7c19ce17a..084a36bd92 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/ubuntu.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Docker/tasks/ubuntu.yml
@@ -11,6 +11,7 @@
     state: present
   when:
     - ansible_architecture == "x86_64"
+    - ansible_distribution_major_version | int < 20
 
 - name: Add Docker Repo for Ubuntu s390x
   apt_repository:
@@ -18,6 +19,7 @@
     state: present
   when:
     - ansible_architecture == "s390x"
+    - ansible_distribution_major_version | int < 20
 
 - name: Add Docker Repo for Ubuntu ppc64le
   apt_repository:
@@ -25,6 +27,7 @@
     state: present
   when:
     - ansible_architecture == "ppc64le"
+    - ansible_distribution_major_version | int < 20
 
 - name: Add Docker Repo for Ubuntu aarch64
   apt_repository:
@@ -32,6 +35,7 @@
     state: present
   when:
     - ansible_architecture == "aarch64"
+    - ansible_distribution_major_version | int < 20
 
 - name: Add Docker Repo for Ubuntu armv7l
   apt_repository:
@@ -39,6 +43,7 @@
     state: present
   when:
     - ansible_architecture == "armv7l"
+    - ansible_distribution_major_version | int < 20
 
 - name: Install Docker prerequisites for Ubuntu
   apt: