diff --git a/aws_jira_dc_node.yml b/aws_jira_dc_node.yml
index f0502dd..17306cd 100644
--- a/aws_jira_dc_node.yml
+++ b/aws_jira_dc_node.yml
@@ -3,8 +3,9 @@
   become: true
 
   vars:
-    atl_product: jira
-    atl_product_user: jira
+    atl_product_family: "jira"
+    atl_product_edition: "jira-software"
+    atl_product_user: "jira"
 
   roles:
     - linux_common
diff --git a/group_vars/all.yml b/group_vars/all.yml
index 61c14e7..02c8e55 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -10,9 +10,10 @@ postgres_version: "9.6"
 git_version: "2.14.4"
 atl_shared_mountpoint: "/media/atl"
 
-# FIXME: Some of these could be overridden from the environment.
+# FIXME: Some of these should be overridden from the environment?
 atl_home_base: "/var/atlassian/application-data"
-atl_product_home: "{{ atl_home_base }}/{{ atl_product }}"
+atl_product_home: "{{ atl_home_base }}/{{ atl_product_family }}"
+atl_product_home_shared: "{{ atl_shared_mountpoint }}/{{ atl_product_family }}/shared"
 
 atl_product_installation_base: "/opt/atlassian"
 atl_product_installation_dir: "{{ atl_product_installation_base }}/{{ atl_product }}"
@@ -22,4 +23,3 @@ atl_installer_temp: "{{ atl_product_installation_base }}/tmp"
 #  set in /etc/atl by the CloudFormation template and sourced before
 #  Ansible is run. See bin/ansible-with-atl-env for a convenient wrapper
 atl_efs_id: "{{ lookup('env', 'ATL_EFS_ID') }}"
-
diff --git a/roles/product_common/molecule/default/playbook.yml b/roles/product_common/molecule/default/playbook.yml
index f060ef6..a3dbc4d 100644
--- a/roles/product_common/molecule/default/playbook.yml
+++ b/roles/product_common/molecule/default/playbook.yml
@@ -5,6 +5,7 @@
     atl_product_user: "testuser"
     atl_product_home: "/opt/atlassian/product"
     atl_installer_temp: "/opt/atlassian/temp"
+    atl_product_home_shared: "/media/atl/jira/shared"
   roles:
     - role: linux_common
     - role: product_common
diff --git a/roles/product_common/molecule/default/tests/test_default.py b/roles/product_common/molecule/default/tests/test_default.py
index fa12b01..7f748b3 100644
--- a/roles/product_common/molecule/default/tests/test_default.py
+++ b/roles/product_common/molecule/default/tests/test_default.py
@@ -14,7 +14,8 @@ def test_user_created(host):
 
 @pytest.mark.parametrize('target', [
     '/opt/atlassian/product',
-    '/opt/atlassian/temp'
+    '/opt/atlassian/temp',
+    '/media/atl/jira/shared'
 ])
 def test_dirs_created(host, target):
     d = host.file(target)
diff --git a/roles/product_common/tasks/main.yml b/roles/product_common/tasks/main.yml
index 130d3c7..dd20c8b 100644
--- a/roles/product_common/tasks/main.yml
+++ b/roles/product_common/tasks/main.yml
@@ -17,3 +17,4 @@
   with_items:
     - "{{ atl_product_home }}"
     - "{{ atl_installer_temp }}"
+    - "{{ atl_product_home_shared }}"