diff --git a/roles/bitbucket_config/default/main.yaml b/roles/bitbucket_config/default/main.yaml
deleted file mode 100644
index d370bf2..0000000
--- a/roles/bitbucket_config/default/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-elasticsearch_config_template: {{ atl_product_installation_versioned }}/elasticsearch/config-template/elasticsearch.yml
\ No newline at end of file
diff --git a/roles/bitbucket_config/tasks/main.yml b/roles/bitbucket_config/tasks/main.yml
index 4028a86..a12f6ee 100644
--- a/roles/bitbucket_config/tasks/main.yml
+++ b/roles/bitbucket_config/tasks/main.yml
@@ -30,9 +30,3 @@
     block: |
         BITBUCKET_SHARED_HOME="{{ atl_product_home_shared }}"
         export BITBUCKET_SHARED_HOME
-
-- name: Make sure elasticsearch data isn't stored in ${BITBUCKET_HOME}/shared
-  lineinfile:
-    path: '{{ elasticsearch_config_template }}'
-    line: '  data: ${BITBUCKET_HOME}/search/data'
-    regexp: '^\s{2}data:\s\$\{BITBUCKET_HOME\}\/s.+$'
\ No newline at end of file
diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2
index 444855f..05f1cac 100644
--- a/roles/bitbucket_config/templates/bitbucket.properties.j2
+++ b/roles/bitbucket_config/templates/bitbucket.properties.j2
@@ -25,12 +25,9 @@ setup.sysadmin.emailAddress=admin@yourcompany.com
 server.proxy-name={{ atl_proxy_name }}
 server.secure={{ atl_ssl_proxy }}
 server.require-ssl={{ atl_ssl_proxy }}
+server.scheme={{ atl_tomcat_scheme }}
+server.proxy-port={{ atl_proxy_port }}
 {% if atl_ssl_proxy == 'true' %}
-server.scheme=https
-server.proxy-port=443
 server.additional-connector.1.port=7991
-{% else %}
-server.scheme=http
-server.proxy-port=80
 {% endif %}