diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml
index 96c19d8..6b4f23f 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"