diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml
index 96c19d8..d0eecba 100644
--- a/aws_bitbucket_dc_node.yml
+++ b/aws_bitbucket_dc_node.yml
@@ -10,6 +10,10 @@
 
     atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}"
 
+    atl_use_system_jdk: true
+    java_major_version: "11" # BB 8 will drop JDK 8 support
+    atl_download_format: "tarball"
+
     atl_nfs_mountpoint: "{{ atl_shared_mountpoint }}/bitbucket/shared"
     atl_nfs_target: "{{ atl_shared_mountpoint }}/bitbucket/shared"
     atl_nfs_version: "3"
@@ -18,6 +22,7 @@
       - "UMask=0027"
       - "LimitNOFILE=4096"
       - "Environment=BITBUCKET_HOME={{ atl_product_home }}"
+      - "Environment=JAVA_HOME=/usr/lib/jvm/java"
       - "Environment=JVM_MAXIMUM_MEMORY={{ atl_jvm_heap }}"
       - "Environment=JVM_MINIMUM_MEMORY={{ atl_jvm_heap }}"
       - "Environment=JVM_SUPPORT_RECOMMENDED_ARGS={{ atl_jvm_opts }}"
diff --git a/aws_confluence_dc_node.yml b/aws_confluence_dc_node.yml
index 046657c..3823305 100644
--- a/aws_confluence_dc_node.yml
+++ b/aws_confluence_dc_node.yml
@@ -8,6 +8,10 @@
     atl_product_user: "confluence"
     atl_product_edition: "confluence"
 
+    atl_use_system_jdk: true
+    java_major_version: "8"
+    atl_download_format: "tarball"
+
     atl_jdbc_encoding: 'UTF-8'
     atl_jdbc_collation: 'en_US.UTF-8'
 
diff --git a/aws_confluence_synchrony_node.yml b/aws_confluence_synchrony_node.yml
index b0fd8f2..f7750fc 100644
--- a/aws_confluence_synchrony_node.yml
+++ b/aws_confluence_synchrony_node.yml
@@ -9,6 +9,10 @@
     atl_product_user: "confluence"
     atl_product_edition: "confluence"
 
+    atl_use_system_jdk: true
+    java_major_version: "8"
+    atl_download_format: "tarball"
+    
     atl_startup_systemd_params:
       - "EnvironmentFile=/etc/atl"
       - "EnvironmentFile=/etc/atl.synchrony"
diff --git a/aws_jira_dc_node.yml b/aws_jira_dc_node.yml
index 1a40591..e28a29d 100644
--- a/aws_jira_dc_node.yml
+++ b/aws_jira_dc_node.yml
@@ -10,6 +10,10 @@
     atl_install_jsd_as_obr: "{{ lookup('env', 'ATL_JSD_ASOBR') | bool }}"
     atl_systemd_service_name: "jira.service"
 
+    atl_use_system_jdk: true
+    java_major_version: "8"
+    atl_download_format: "tarball"
+
     atl_startup_systemd_params:
       - "LimitNOFILE=16384"