diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml
index 3108bf8..a7a6d6d 100644
--- a/aws_bitbucket_dc_node.yml
+++ b/aws_bitbucket_dc_node.yml
@@ -8,6 +8,8 @@
     atl_product_edition: "bitbucket"
     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"
 
@@ -15,7 +17,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"
       - "--no-search"
diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index 2208f82..bbfe960 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -23,7 +23,7 @@ atl_product_home: "{{ atl_home_base }}/{{ atl_product_family }}"
 atl_product_shared_home_map:
   confluence: "confluence/shared-home"
   jira: "jira/shared"
-  stash: "bitbucket"
+  stash: "bitbucket/shared"
 atl_product_home_shared: "{{ atl_shared_mountpoint }}/{{ atl_product_shared_home_map[atl_product_family] }}"
 atl_product_shared_plugins: "{{ atl_product_home_shared }}/plugins/installed-plugins"
 
diff --git a/roles/product_install/molecule/bitbucket_latest/tests/test_default.py b/roles/product_install/molecule/bitbucket_latest/tests/test_default.py
index d83ada5..7157e10 100644
--- a/roles/product_install/molecule/bitbucket_latest/tests/test_default.py
+++ b/roles/product_install/molecule/bitbucket_latest/tests/test_default.py
@@ -8,7 +8,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
 
 def test_version_downloaded(host):
-    verfile = host.file('/media/atl/stash/shared/bitbucket.version')
+    verfile = host.file('/media/atl/bitbucket/shared/bitbucket.version')
     assert verfile.exists
 
 def test_symlink_created(host):
@@ -21,7 +21,7 @@ def test_unpacked(host):
     assert verfile.exists
 
 def test_version_file_is_latest(host):
-    verfile = host.file('/media/atl/stash/shared/bitbucket.version')
+    verfile = host.file('/media/atl/bitbucket/shared/bitbucket.version')
     assert verfile.exists
 
     upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/bitbucket/versions/latest")
diff --git a/roles/product_startup/molecule/bitbucket/playbook.yml b/roles/product_startup/molecule/bitbucket/playbook.yml
index ccbb797..2658f21 100644
--- a/roles/product_startup/molecule/bitbucket/playbook.yml
+++ b/roles/product_startup/molecule/bitbucket/playbook.yml
@@ -6,6 +6,9 @@
     atl_product_family: "stash"
     atl_product_edition: "bitbucket"
 
+    atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}"
+    atl_product_home_shared: "{{ atl_product_home }}/shared"
+
     atl_startup_systemd_params:
       - "UMask=0027"
       - "LimitNOFILE=4096"