diff --git a/roles/bitbucket_config/defaults/main.yaml b/roles/bitbucket_config/defaults/main.yaml
index 9790c09..9eccfb1 100644
--- a/roles/bitbucket_config/defaults/main.yaml
+++ b/roles/bitbucket_config/defaults/main.yaml
@@ -1,3 +1,4 @@
 ---
 
 atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}"
+atl_bitbucket_properties: "{{ lookup('env', 'ATL_BITBUCKET_PROPERTIES') }}"
diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2
index 444855f..13306e2 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 %}
 
+{% if atl_bitbucket_properties is defined $}
+{{ atl_bitbucket_properties }}
+{% endif %}