diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml
index 0258da8..678037b 100644
--- a/aws_bitbucket_dc_node.yml
+++ b/aws_bitbucket_dc_node.yml
@@ -34,3 +34,5 @@
     - role: restore_backups
     - role: bitbucket_config
     - role: product_startup
+  
+
diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index 89c158e..2dea1b5 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -134,3 +134,10 @@ atl_rds_security_group: "{{ lookup('env', 'ATL_RDS_SECURITY_GROUP') }}"
 
 atl_backup_manifest_url: "{{ lookup('env', 'ATL_BACKUP_MANIFEST_URL') }}"
 atl_restore_required: "{{ atl_backup_manifest_url is defined and atl_backup_manifest_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/default/main.yaml b/roles/bitbucket_config/default/main.yaml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/roles/bitbucket_config/default/main.yaml
@@ -0,0 +1 @@
+---
diff --git a/roles/bitbucket_config/molecule/default/main.yml b/roles/bitbucket_config/molecule/default/main.yml
new file mode 100644
index 0000000..77afc1c
--- /dev/null
+++ b/roles/bitbucket_config/molecule/default/main.yml
@@ -0,0 +1,4 @@
+---
+
+atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}"
+atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}"
diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2
index 2ecece1..444855f 100644
--- a/roles/bitbucket_config/templates/bitbucket.properties.j2
+++ b/roles/bitbucket_config/templates/bitbucket.properties.j2
@@ -14,6 +14,13 @@ 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=Bitbucket
+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=AdminIstrator
+setup.sysadmin.emailAddress=admin@yourcompany.com
 
 server.proxy-name={{ atl_proxy_name }}
 server.secure={{ atl_ssl_proxy }}
@@ -26,3 +33,4 @@ server.additional-connector.1.port=7991
 server.scheme=http
 server.proxy-port=80
 {% endif %}
+