diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index 9db7661..b331964 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -153,10 +153,3 @@ 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/molecule/default/main.yml b/roles/bitbucket_common/defaults/main.yml
similarity index 53%
rename from roles/bitbucket_config/molecule/default/main.yml
rename to roles/bitbucket_common/defaults/main.yml
index 77afc1c..2dbd25b 100644
--- a/roles/bitbucket_config/molecule/default/main.yml
+++ b/roles/bitbucket_common/defaults/main.yml
@@ -1,4 +1,5 @@
 ---
 
-atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}"
+atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}"
 atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}"
+
diff --git a/roles/bitbucket_config/default/main.yaml b/roles/bitbucket_config/default/main.yaml
deleted file mode 100644
index ed97d53..0000000
--- a/roles/bitbucket_config/default/main.yaml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/roles/bitbucket_config/defaults/main.yaml b/roles/bitbucket_config/defaults/main.yaml
new file mode 100644
index 0000000..1ae8340
--- /dev/null
+++ b/roles/bitbucket_config/defaults/main.yaml
@@ -0,0 +1,5 @@
+---
+
+atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}"
+atl_bitbucket_properties_raw: "{{ lookup('env', 'ATL_BITBUCKET_PROPERTIES') }}"
+atl_bitbucket_properties: "{{ atl_bitbucket_properties_raw.split(' ') | reject('equalto', '') | list }}"
diff --git a/roles/bitbucket_config/meta/main.yml b/roles/bitbucket_config/meta/main.yml
new file mode 100644
index 0000000..ca5ee97
--- /dev/null
+++ b/roles/bitbucket_config/meta/main.yml
@@ -0,0 +1,4 @@
+---
+
+dependencies:
+  - bitbucket_common
diff --git a/roles/bitbucket_config/molecule/default/molecule.yml b/roles/bitbucket_config/molecule/default/molecule.yml
index 7f082f6..8829d75 100644
--- a/roles/bitbucket_config/molecule/default/molecule.yml
+++ b/roles/bitbucket_config/molecule/default/molecule.yml
@@ -5,6 +5,9 @@ driver:
   name: docker
 lint:
   name: yamllint
+  options:
+    config-data:
+      line-length: disable
 platforms:
   - name: amazon_linux2
     image: amazonlinux:2
diff --git a/roles/bitbucket_config/molecule/default/playbook.yml b/roles/bitbucket_config/molecule/default/playbook.yml
index f9c424b..2a1addf 100644
--- a/roles/bitbucket_config/molecule/default/playbook.yml
+++ b/roles/bitbucket_config/molecule/default/playbook.yml
@@ -12,6 +12,8 @@
     atl_jdbc_user: 'bb_db_user'
     atl_jdbc_password: 'molecule_password'
 
+    atl_bitbucket_properties_raw: "key1=val1 key2=val2    key3=val3"
+
   roles:
     - role: linux_common
     - role: product_common
diff --git a/roles/bitbucket_config/molecule/default/tests/test_default.py b/roles/bitbucket_config/molecule/default/tests/test_default.py
index 00593ec..770c3bb 100644
--- a/roles/bitbucket_config/molecule/default/tests/test_default.py
+++ b/roles/bitbucket_config/molecule/default/tests/test_default.py
@@ -14,3 +14,7 @@ def test_config_file(host):
     assert f.contains("jdbc.driver=org.postgresql.Driver")
     assert f.contains("jdbc.user=bb_db_user")
     assert f.contains("jdbc.password=molecule_password")
+
+    assert f.contains("^key1=val1$")
+    assert f.contains("^key2=val2$")
+    assert f.contains("^key3=val3$")
diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2
index 444855f..3551c5b 100644
--- a/roles/bitbucket_config/templates/bitbucket.properties.j2
+++ b/roles/bitbucket_config/templates/bitbucket.properties.j2
@@ -1,4 +1,4 @@
-# Created by Ansible
+# Created by Ansible role `bitbucket_config`
 jdbc.driver={{ atl_db_driver }}
 jdbc.url={{ atl_jdbc_url }}
 jdbc.user={{ atl_jdbc_user }}
@@ -34,3 +34,6 @@ server.scheme=http
 server.proxy-port=80
 {% endif %}
 
+{% for prop in atl_bitbucket_properties %}
+{{ prop }}
+{% endfor %}
diff --git a/roles/bitbucket_dataset_restore/defaults/main.yml b/roles/bitbucket_dataset_restore/defaults/main.yml
new file mode 100644
index 0000000..90d88ea
--- /dev/null
+++ b/roles/bitbucket_dataset_restore/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+
+atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}"
diff --git a/roles/bitbucket_dataset_restore/meta/main.yml b/roles/bitbucket_dataset_restore/meta/main.yml
new file mode 100644
index 0000000..ca5ee97
--- /dev/null
+++ b/roles/bitbucket_dataset_restore/meta/main.yml
@@ -0,0 +1,4 @@
+---
+
+dependencies:
+  - bitbucket_common