diff --git a/roles/crowd_config/tasks/main.yml b/roles/crowd_config/tasks/main.yml
index e244a8b..aa41479 100644
--- a/roles/crowd_config/tasks/main.yml
+++ b/roles/crowd_config/tasks/main.yml
@@ -16,12 +16,6 @@
     - 'JVM_MINIMUM_MEMORY'
     - 'JVM_MAXIMUM_MEMORY'
 
-- name: Set Crowd home directory
-  lineinfile:
-    path: "{{ atl_product_installation_versioned }}/apache-tomcat/bin/setenv.sh"
-    regexp: "CROWD_HOME="
-    line: 'CROWD_HOME="{{ atl_product_home }}"'
-
 - name: Set Crowd home directory in crowd-init.properties file
   lineinfile:
     path: "{{ atl_product_installation_versioned }}/crowd-webapp/WEB-INF/classes/crowd-init.properties"
@@ -75,7 +69,16 @@
     group: "{{ atl_product_user }}"
     recurse: true
   with_items:
-    - "{{ atl_product_installation_versioned }}/logs"
-    - "{{ atl_product_installation_versioned }}/temp"
-    - "{{ atl_product_installation_versioned }}/work"
+    - "{{ atl_product_installation_versioned }}/apache-tomcat/logs"
+    - "{{ atl_product_installation_versioned }}/apache-tomcat/temp"
+    - "{{ atl_product_installation_versioned }}/apache-tomcat/work"
+  changed_when: false  # For Molecule idempotence check
+
+- name: Symlink Crowd shared home directory
+  file:
+    src: "{{ atl_product_home_shared }}"
+    dest: "{{ atl_product_home }}/shared"
+    state: link
+    owner: "{{ atl_product_user }}"
+    group: "{{ atl_product_user }}"
   changed_when: false  # For Molecule idempotence check
diff --git a/roles/crowd_config/templates/server.xml.j2 b/roles/crowd_config/templates/server.xml.j2
index a904c24..6f9751b 100644
--- a/roles/crowd_config/templates/server.xml.j2
+++ b/roles/crowd_config/templates/server.xml.j2
@@ -1,19 +1,66 @@
-<Server port="{{ atl_tomcat_mgmt_port }}" shutdown="SHUTDOWN">
+<?xml version="1.0" encoding="utf-8"?>
+
+<Server port="{{ atl_tomcat_mgmt_port }}" 
+        shutdown="SHUTDOWN">
 
     <Service name="Catalina">
 
-        <Connector acceptCount="{{ atl_tomcat_acceptcount }}" connectionTimeout="{{ atl_tomcat_connectiontimeout }}" disableUploadTimeout="true" enableLookups="{{ atl_tomcat_enablelookups }}" maxHttpHeaderSize="8192" maxThreads="{{ atl_tomcat_maxthreads }}" minSpareThreads="{{ atl_tomcat_minsparethreads }}" port="{{ atl_tomcat_port }}" redirectPort="{{ atl_tomcat_redirectport }}" useBodyEncodingForURI="true" URIEncoding="UTF-8" compression="on" sendReasonPhrase="true" compressableMimeType="text/html,text/xml,application/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript" secure="{{ atl_tomcat_secure }}" scheme="{{ atl_tomcat_scheme }}" proxyName="{{ atl_proxy_name }}" proxyPort="{{ atl_proxy_port }}" protocol="{{ atl_tomcat_protocol }}"></Connector>
+        <Connector acceptCount="{{ atl_tomcat_acceptcount }}" 
+                   connectionTimeout="{{ atl_tomcat_connectiontimeout }}" 
+                   disableUploadTimeout="true" 
+                   enableLookups="{{ atl_tomcat_enablelookups }}" 
+                   maxHttpHeaderSize="8192" 
+                   maxThreads="{{ atl_tomcat_maxthreads }}" 
+                   minSpareThreads="{{ atl_tomcat_minsparethreads }}" 
+                   port="{{ atl_tomcat_port }}" 
+                   redirectPort="{{ atl_tomcat_redirectport }}" 
+                   useBodyEncodingForURI="true" 
+                   URIEncoding="UTF-8" 
+                   compression="on" 
+                   sendReasonPhrase="true" 
+                   compressableMimeType="text/html,text/xml,application/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript" 
+                   secure="{{ atl_tomcat_secure }}" 
+                   scheme="{{ atl_tomcat_scheme }}" 
+                   proxyName="{{ atl_proxy_name }}" 
+                   proxyPort="{{ atl_proxy_port }}" 
+                   protocol="{{ atl_tomcat_protocol }}">
+        </Connector>
 
-        <Engine defaultHost="localhost" name="Catalina">
-            <Host appBase="webapps" autoDeploy="true" name="localhost" unpackWARs="true"><Context path="{{ atl_tomcat_contextpath }}" docBase="../../crowd-webapp" debug="0"><Manager pathname=""></Manager></Context></Host>
+        <Engine defaultHost="localhost" 
+                name="Catalina">
+            <Host appBase="webapps" 
+                  autoDeploy="true" 
+                  name="localhost" 
+                  unpackWARs="true">
+              <Context path="{{ atl_tomcat_contextpath }}" 
+                       docBase="../../crowd-webapp" 
+                       debug="0">
+                       <Manager pathname="">
+                       </Manager>
+              </Context>
+            </Host>
         </Engine>
 
         <!-- To connect to an external web server (typically Apache) -->
         <!-- Define an AJP 1.3 Connector on port 8009 -->
         <!--
-            <Connector port="8009" enableLookups="{{ atl_tomcat_enablelookups }}" redirectPort="{{ atl_tomcat_redirectport }}" protocol=""AJP/1.3"" />
+            <Connector port="8009" 
+                       enableLookups="{{ atl_tomcat_enablelookups }}" 
+                       redirectPort="{{ atl_tomcat_redirectport }}" 
+                       protocol=""AJP/1.3"" />
         -->
-    <Connector port="{{ atl_tomcat_redirectport }}" protocol="{{ atl_tomcat_protocol }}" relaxedPathChars="[]|" relaxedQueryChars='[]|{}^\`"&lt;&gt;' maxHttpHeaderSize="65536" URIEncoding="UTF-8" connectionTimeout="{{ atl_tomcat_connectiontimeout }}" useBodyEncodingForURI="true" compression="on" compressableMimeType="text/html,text/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript"></Connector></Service>
+        <Connector port="{{ atl_tomcat_redirectport }}" 
+                   protocol="{{ atl_tomcat_protocol }}" 
+                   relaxedPathChars="[]|" 
+                   relaxedQueryChars='[]|{}^\`"&lt;&gt;' 
+                   maxHttpHeaderSize="65536" 
+                   URIEncoding="UTF-8" 
+                   connectionTimeout="{{ atl_tomcat_connectiontimeout }}" 
+                   useBodyEncodingForURI="true" 
+                   compression="on" 
+                   compressableMimeType="text/html,text/xml,text/plain,text/css,application/json,application/javascript,application/x-javascript">
+        </Connector>
+    </Service>
 
     <!-- Security listener. Documentation at /docs/config/listeners.html
     <Listener className="org.apache.catalina.security.SecurityListener" />