diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index 4f8cb77..e677015 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -39,8 +39,7 @@ atl_installer_temp: "{{ atl_installation_base }}/tmp"
 # See product_common/task/ubuntu.yml for an example of apropriate
 # linking using `alternatives`.
 atl_java_home: "{{ '/usr/lib/jvm/java' if atl_use_system_jdk else (atl_product_installation_current + '/jre') }}"
-atl_jre_home: "{{ '/usr/lib/jvm/jre' if atl_use_system_jdk else atl_java_home }}"
-atl_java_binary: "{{ atl_jre_home }}/bin/java"
+atl_java_binary: "{{ atl_java_home }}/bin/java"
 
 atl_product_logs_default: &logs_default
   - path: "{{ atl_product_installation_current }}/logs/*"
diff --git a/roles/confluence_config/defaults/main.yml b/roles/confluence_config/defaults/main.yml
index 4bd4d10..e71288d 100644
--- a/roles/confluence_config/defaults/main.yml
+++ b/roles/confluence_config/defaults/main.yml
@@ -3,8 +3,6 @@
 atl_jvm_heap: "2048m"
 atl_fonts_fallback_dirs:
     - "{{ atl_java_home }}/lib/fonts/fallback/"
-    - "{{ atl_jre_home }}/lib/fonts/fallback/"
-
 
 atl_autologin_cookie_age: "{{ lookup('env', 'ATL_AUTOLOGIN_COOKIE_AGE') }}"
 
diff --git a/roles/crowd_config/tasks/main.yml b/roles/crowd_config/tasks/main.yml
index e3b7c72..87aea58 100644
--- a/roles/crowd_config/tasks/main.yml
+++ b/roles/crowd_config/tasks/main.yml
@@ -148,7 +148,7 @@
     xpath: "/application-configuration/properties/property[@name='hibernate.connection.url']"
     value: "{{ atl_jdbc_url }}?reWriteBatchedInserts=true"
   when: crowd_cfg_stat_result.stat.exists
-  
+
 - name: Remove crowd.xml to prevent duplicates from appearing in cluster reporting
   file:
     path: "{{ atl_product_installation_versioned }}/apache-tomcat/conf/Catalina/localhost/crowd.xml"
diff --git a/roles/product_common/tasks/amazon.yml b/roles/product_common/tasks/amazon.yml
index 4d33f79..c6c836a 100644
--- a/roles/product_common/tasks/amazon.yml
+++ b/roles/product_common/tasks/amazon.yml
@@ -1,10 +1,26 @@
 ---
 
-- name: Install JDK if necessary on Amazon Linux
-  yum:
-    name:
-      - java-1.{{ java_major_version }}.0-openjdk-devel
+- name: Add AdoptOpenJDK repo and install if necessary on Amazon Linux
+  block:
+
+    - name: Add AdoptOpenJDK yum repository
+      yum_repository:
+        name: AdoptOpenJDK
+        file: adoptopenjdk
+        description: AdoptOpenJDK Repo
+        baseurl: "https://adoptopenjdk.jfrog.io/adoptopenjdk/rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}/"
+        gpgkey: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
+        gpgcheck: yes
+        state: present
+
+    - name: Install AdoptOpenJDK
+      yum:
+        name: "adoptopenjdk-{{ java_major_version }}-hotspot"
+        state: present
+
   when: atl_use_system_jdk
+  tags:
+    - runtime_pkg
 
 - name: Install other base packages on Amazon Linux
   yum:
diff --git a/roles/product_common/tasks/ubuntu.yml b/roles/product_common/tasks/ubuntu.yml
index 0b033c5..ad2c0dd 100644
--- a/roles/product_common/tasks/ubuntu.yml
+++ b/roles/product_common/tasks/ubuntu.yml
@@ -1,25 +1,35 @@
 ---
 
-- name: Install JDK if necessary on Ubuntu
+- name: Add AdoptOpenJDK repo and install if necessary on Ubuntu
   block:
 
-    - name: Install JDK package
-      package:
-        name:
-          - openjdk-{{ java_major_version }}-jdk-headless
+    - name: Install gnupg
+      apt:
+        name: gnupg
+        state: present
+
+    - name: Add AdoptOpenJDK debian repo public key
+      apt_key:
+        url: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
+        state: present
+
+    - name: Add AdoptOpenJDK debian repository
+      apt_repository:
+        repo: "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb {{ ansible_distribution_release }} main"
+        state: present
+        filename: adoptopenjdk
+
+    - name: Install AdoptOpenJDK
+      apt:
+        name: "adoptopenjdk-{{ java_major_version }}-hotspot"
+        update_cache: yes
+        state: present
 
     - name: Ensure common JDK symlink exists
       alternatives:
         link: "/usr/lib/jvm/java"
         name: "java_sdk"
-        path: "/usr/lib/jvm/java-8-openjdk-amd64"
-        priority: 99
-
-    - name: Ensure common JRE symlink exists
-      alternatives:
-        link: "/usr/lib/jvm/jre"
-        name: "jre"
-        path: "/usr/lib/jvm/java-8-openjdk-amd64/jre"
+        path: "/usr/lib/jvm/adoptopenjdk-{{ java_major_version }}-hotspot"
         priority: 99
 
   when: atl_use_system_jdk