diff --git a/group_vars/all.yml b/group_vars/all.yml
index f545972..691e7d0 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -4,7 +4,16 @@ postgres_version: "9.6"
 git_version: "2.14.4"
 atl_shared_mountpoint: "/media/atl"
 
+# FIXME: Some of these could be overridden from the environment.
+atl_home_base: "/var/atlassian/application-data"
+atl_product_home: "{{ atl_home_base }}/{{ atl_product }}"
+
+atl_product_installation_base: "/opt/atlassian"
+atl_product_installation_dir: "{{ atl_product_installation_base }}/{{ atl_product }}"
+atl_installer_temp: "{{ atl_product_installation_base }}/tmp"
+
 #  The following are imports from the environment. These are generally
 #  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_base/molecule/default/playbook.yml b/roles/product_base/molecule/default/playbook.yml
index 82e95cf..becadbf 100644
--- a/roles/product_base/molecule/default/playbook.yml
+++ b/roles/product_base/molecule/default/playbook.yml
@@ -4,6 +4,6 @@
   vars:
     atl_product_user: "testuser"
     atl_product_home: "/opt/atlassian/product"
-    atl_temp_dir: "/opt/atlassian/temp"
+    atl_installer_temp: "/opt/atlassian/temp"
   roles:
     - role: product_base
diff --git a/roles/product_base/tasks/main.yml b/roles/product_base/tasks/main.yml
index 2447210..dd62a7e 100644
--- a/roles/product_base/tasks/main.yml
+++ b/roles/product_base/tasks/main.yml
@@ -13,4 +13,4 @@
     owner: "{{ atl_product_user }}"
   with_items:
     - "{{ atl_product_home }}"
-    - "{{ atl_temp_dir }}"
+    - "{{ atl_installer_temp }}"