diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index 95b59e5..ab854c1 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -18,7 +18,7 @@ atl_shared_mountpoint: "/media/atl"
 atl_product_user_uid: '2001'
 
 # FIXME: Some of these should be overridden from the environment?
-atl_home_base: /var/atlassian/application-data
+atl_home_base: "/var/atlassian/application-data"
 atl_product_home: "{{ atl_home_base }}/{{ atl_product_family }}"
 atl_product_shared_home_map:
   confluence: "confluence/shared-home"
diff --git a/roles/crowd_config/tasks/main.yml b/roles/crowd_config/tasks/main.yml
index 976718d..cd59fb6 100644
--- a/roles/crowd_config/tasks/main.yml
+++ b/roles/crowd_config/tasks/main.yml
@@ -19,7 +19,7 @@
 - name: Set Crowd home directory in crowd-init.properties file
   lineinfile:
     path: "{{ atl_product_installation_versioned }}/crowd-webapp/WEB-INF/classes/crowd-init.properties"
-    line: 'crowd.home="{{ atl_product_home }}"'
+    line: 'crowd.home={{ atl_product_home }}'
 
 - name: Set the Tomcat environment
   lineinfile: