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_common/defaults/main.yml b/roles/bitbucket_common/defaults/main.yml
new file mode 100644
index 0000000..2dbd25b
--- /dev/null
+++ b/roles/bitbucket_common/defaults/main.yml
@@ -0,0 +1,5 @@
+---
+
+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..9790c09
--- /dev/null
+++ b/roles/bitbucket_config/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+
+atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}"
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_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