diff --git a/roles/jira_config/defaults/main.yml b/roles/jira_config/defaults/main.yml
index 0a90817..e2ca314 100644
--- a/roles/jira_config/defaults/main.yml
+++ b/roles/jira_config/defaults/main.yml
@@ -1,6 +1,7 @@
 ---
 
 atl_jvm_heap: "2048m"
+atl_jvm_opts: ""
 
 atl_catalina_opts: ""
 atl_catalina_opts_extra: >-
@@ -21,6 +22,7 @@ atl_tomcat_protocol: "HTTP/1.1"
 atl_tomcat_redirectport: ""
 atl_tomcat_scheme: "http"
 atl_tomcat_secure: "false"
+atl_tomcat_enablelookups: "false"
 
 atl_db_poolminsize: '20'
 atl_db_poolmaxsize: '100'
@@ -34,3 +36,5 @@ atl_db_removeabandoned: 'true'
 atl_db_removeabandonedtimeout: '300'
 atl_db_testwhileidle: 'true'
 atl_db_testonborrow: 'false'
+
+atl_enable_clustering: true
diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml
index 11cf442..7d2fdc3 100644
--- a/roles/jira_config/tasks/main.yml
+++ b/roles/jira_config/tasks/main.yml
@@ -12,6 +12,7 @@
     src: cluster.properties.j2
     dest: "{{ atl_product_home }}/cluster.properties"
     owner: "{{ atl_product_user }}"
+  when: atl_enable_clustering
 
 - name: Create server config
   template: