diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml
index 908ff01..573aa1d 100644
--- a/aws_bitbucket_dc_node.yml
+++ b/aws_bitbucket_dc_node.yml
@@ -4,10 +4,11 @@
 
   vars:
     # See group_vars/aws_node_local.yml, which pull vars from the environment.
-    atl_product_family: "stash"
+    atl_product_family: "bitbucket"
     atl_product_edition: "bitbucket"
     atl_product_user: "bitbucket"
 
+    # FIXME this is a temorary workaround to use EFS while testing abstraction
     atl_nfs_version: "4.1"
 
     atl_startup_systemd_params:
diff --git a/roles/bitbucket_config/molecule/default/playbook.yml b/roles/bitbucket_config/molecule/default/playbook.yml
index f9c424b..52ba852 100644
--- a/roles/bitbucket_config/molecule/default/playbook.yml
+++ b/roles/bitbucket_config/molecule/default/playbook.yml
@@ -2,13 +2,11 @@
 - name: Converge
   hosts: all
   vars:
-    atl_product_family: "stash"
+    atl_product_family: "bitbucket"
     atl_product_edition: "bitbucket"
     atl_product_user: "bitbucket"
     atl_product_version: "6.3.1"
 
-    atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}"
-
     atl_jdbc_user: 'bb_db_user'
     atl_jdbc_password: 'molecule_password'
 
diff --git a/roles/product_install/molecule/bitbucket_latest/playbook.yml b/roles/product_install/molecule/bitbucket_latest/playbook.yml
index 55ad545..39c7a9a 100644
--- a/roles/product_install/molecule/bitbucket_latest/playbook.yml
+++ b/roles/product_install/molecule/bitbucket_latest/playbook.yml
@@ -6,7 +6,6 @@
     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 0542b3a..9ea765e 100644
--- a/roles/product_startup/molecule/bitbucket/playbook.yml
+++ b/roles/product_startup/molecule/bitbucket/playbook.yml
@@ -3,11 +3,9 @@
   hosts: all
   vars:
     atl_product_user: "bitbucket"
-    atl_product_family: "stash"
+    atl_product_family: "bitbucket"
     atl_product_edition: "bitbucket"
 
-    atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}"
-    atl_product_home_shared: "{{ atl_product_home }}/shared"
     atl_jvm_heap: "dummy_heap"
     atl_jvm_opts: "dummy_opts"