diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml
index a7a6d6d..d473ea5 100644
--- a/aws_bitbucket_dc_node.yml
+++ b/aws_bitbucket_dc_node.yml
@@ -9,11 +9,10 @@
     atl_product_user: "bitbucket"
 
     atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}"
-    atl_product_home_shared: "{{ atl_product_home }}/shared"
+
     atl_nfs_mountpoint: "{{ atl_shared_mountpoint }}/bitbucket/shared"
     atl_nfs_target: "{{ atl_shared_mountpoint }}/bitbucket/shared"
 
-
     atl_startup_systemd_params:
       - "UMask=0027"
       - "LimitNOFILE=4096"
diff --git a/roles/bitbucket_config/tasks/main.yml b/roles/bitbucket_config/tasks/main.yml
index 6a23bdb..cf6bcce 100644
--- a/roles/bitbucket_config/tasks/main.yml
+++ b/roles/bitbucket_config/tasks/main.yml
@@ -2,7 +2,7 @@
 
 - name: Create Bitbucket shared dir if necessary
   file:
-    path: "{{ atl_product_home_shared }}/shared/"
+    path: "{{ atl_product_home_shared }}"
     owner: "{{ atl_product_user }}"
     group: "{{ atl_product_user }}"
     mode: 0750
@@ -11,7 +11,7 @@
 - name: Create Bitbucket config file
   template:
     src: bitbucket.properties.j2
-    dest: "{{ atl_product_home_shared }}/shared/bitbucket.properties"
+    dest: "{{ atl_product_home_shared }}/bitbucket.properties"
     owner: "{{ atl_product_user }}"
     group: "{{ atl_product_user }}"
 
diff --git a/roles/product_install/molecule/bitbucket_latest/playbook.yml b/roles/product_install/molecule/bitbucket_latest/playbook.yml
index b9eb653..907928d 100644
--- a/roles/product_install/molecule/bitbucket_latest/playbook.yml
+++ b/roles/product_install/molecule/bitbucket_latest/playbook.yml
@@ -5,6 +5,9 @@
     atl_product_family: "stash"
     atl_product_edition: "bitbucket"
     atl_product_user: "bitbucket"
+
+    atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}"
+
   roles:
     - role: linux_common
     - role: product_common
diff --git a/roles/product_startup/molecule/bitbucket/playbook.yml b/roles/product_startup/molecule/bitbucket/playbook.yml
index 2658f21..08520cb 100644
--- a/roles/product_startup/molecule/bitbucket/playbook.yml
+++ b/roles/product_startup/molecule/bitbucket/playbook.yml
@@ -12,7 +12,7 @@
     atl_startup_systemd_params:
       - "UMask=0027"
       - "LimitNOFILE=4096"
-      - "Environment=BITBUCKET_HOME={{ atl_product_home_shared }}"
+      - "Environment=BITBUCKET_HOME={{ atl_product_home }}"
 
     atl_startup_exec_options:
       - "-fg"