diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index 480701b..ec9d88c 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -143,7 +143,11 @@ atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}"
 
 
 
+
 atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}"
 atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}"
 atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}"
 
+
+atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}"
+
diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2
index b45a9a2..df777c5 100644
--- a/roles/bitbucket_config/templates/bitbucket.properties.j2
+++ b/roles/bitbucket_config/templates/bitbucket.properties.j2
@@ -14,10 +14,12 @@ hazelcast.group.name={{ atl_aws_stack_name }}
 hazelcast.group.password={{ atl_aws_stack_name }}
 plugin.search.elasticsearch.aws.region={{ atl_aws_region }}
 plugin.search.elasticsearch.baseurl={{ atl_elasticsearch_endpoint }}
+setup.displayName=displayName
+setup.baseUrl = {{ atl_bitbucket_baseurl }}
 setup.license={{ atl_bitbucket_license_key }}
 setup.sysadmin.username=admin
 setup.sysadmin.password={{ atl_bitbucket_admin_password }}
-setup.sysadmin.displayName=Admin Istrator
+setup.sysadmin.displayName=AdminIstrator
 setup.sysadmin.emailAddress=admin@yourcompany.com
 
 server.proxy-name={{ atl_proxy_name }}