diff --git a/roles/bitbucket_config/tasks/main.yml b/roles/bitbucket_config/tasks/main.yml
index 961d5b4..6a23bdb 100644
--- a/roles/bitbucket_config/tasks/main.yml
+++ b/roles/bitbucket_config/tasks/main.yml
@@ -1,9 +1,17 @@
 ---
 
+- name: Create Bitbucket shared dir if necessary
+  file:
+    path: "{{ atl_product_home_shared }}/shared/"
+    owner: "{{ atl_product_user }}"
+    group: "{{ atl_product_user }}"
+    mode: 0750
+    state: directory
+
 - name: Create Bitbucket config file
   template:
     src: bitbucket.properties.j2
-    dest: "{{ atl_product_home_shared }}/bitbucket.properties"
+    dest: "{{ atl_product_home_shared }}/shared/bitbucket.properties"
     owner: "{{ atl_product_user }}"
     group: "{{ atl_product_user }}"