diff --git a/roles/crowd_config/templates/dbconfig.xml.j2 b/roles/crowd_config/templates/dbconfig.xml.j2
index 18c9ed7..1b96cef 100644
--- a/roles/crowd_config/templates/dbconfig.xml.j2
+++ b/roles/crowd_config/templates/dbconfig.xml.j2
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<jira-database-config>
+<crowd-database-config>
   <name>defaultDS</name>
   <delegator-name>default</delegator-name>
   <database-type>postgres72</database-type>
@@ -25,4 +25,4 @@
     <pool-test-while-idle>{{ atl_db_testwhileidle }}</pool-test-while-idle>
     <pool-test-on-borrow>{{ atl_db_testonborrow }}</pool-test-on-borrow>
   </jdbc-datasource>
-</jira-database-config>
+</crowd-database-config>
diff --git a/roles/crowd_config/templates/server.xml.j2 b/roles/crowd_config/templates/server.xml.j2
index b882ff8..a904c24 100644
--- a/roles/crowd_config/templates/server.xml.j2
+++ b/roles/crowd_config/templates/server.xml.j2
@@ -5,7 +5,7 @@
         <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="${catalina.home}/atlassian-crowd" debug="0"><Manager pathname=""></Manager></Context></Host>
+            <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) -->
diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml
index 592635e..feaf5dc 100644
--- a/roles/product_install/defaults/main.yml
+++ b/roles/product_install/defaults/main.yml
@@ -10,7 +10,7 @@ atl_product_version_cache: "{{ atl_product_home_shared }}/{{ atl_product_edition
 
 atl_release_base_url: "https://product-downloads.atlassian.com/software"
 atl_product_base_url: "{{ atl_release_base_url }}/{{ atl_product_family }}/downloads"
-atl_product_download_url: "{{ atl_product_base_url }}/atlassian-{{ atl_download_edition | default(atl_product_edition) }}-{{ atl_product_version }}-x64.bin "
+atl_product_download_url: "{{ atl_product_base_url }}/atlassian-{{ atl_download_edition | default(atl_product_edition) }}-{{ atl_product_version }}-x64.bin"
 atl_crowd_download_url: "{{ atl_product_base_url }}/atlassian-{{ atl_download_edition | default(atl_product_edition) }}-{{ atl_product_version }}.tar.gz"
 atl_crowd_latest_url: "https://www.atlassian.com/software/crowd/downloads/binary/crowd-standalone-distribution-{{atl_latest_version}}.tar.gz"
 
diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml
index bb784eb..a289367 100644
--- a/roles/product_install/tasks/main.yml
+++ b/roles/product_install/tasks/main.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Check for existing version cache file
   stat:
     path: "{{ atl_product_version_cache }}"
@@ -95,14 +97,8 @@
   set_fact:
     atl_product_version: "{{ atl_download_version }}"
 
-#- set_fact:
-#    atl_product_version: '3.4.4'
-
 ######################################################################
 
-#- debug:
-#    msg: "{{ atl_product_edition }}_extra_tasks.yml"
-
 - name: Perform any additional per-edition version setup
   include_tasks: "{{ atl_product_edition }}_extra_tasks.yml"
   when: atl_product_edition!= "crowd"
@@ -123,9 +119,6 @@
     - "{{ atl_product_version_cache_dir }}"
   changed_when: false  # For Molecule idempotence check
 
-- debug:
-    msg: "atl_installer_temp - {{atl_installer_temp}} atl_product_home - {{atl_product_home}} atl_product_installation_versioned- {{atl_product_installation_versioned}} atl_product_version_cache_dir- {{atl_product_version_cache_dir}}"
-
 # At this point atl_product_version should be set, cache if necessary.
 - name: Write override cached version when specified
   template:
diff --git a/roles/product_install/templates/crowd.varfile.j2 b/roles/product_install/templates/crowd.varfile.j2
index 5fff588..94b0c99 100644
--- a/roles/product_install/templates/crowd.varfile.j2
+++ b/roles/product_install/templates/crowd.varfile.j2
@@ -1,6 +1,6 @@
 launch.application$Boolean=false
 rmiPort$Long={{ atl_tomcat_mgmt_port | default('8020') }}
-app.jiraHome={{ atl_product_home }}
+app.crowdHome={{ atl_product_home }}
 app.install.service$Boolean=false
 app.service.account={{ atl_product_user }}
 existingInstallationDir={{ atl_product_installation_versioned }}
diff --git a/roles/product_startup/tasks/main.yml b/roles/product_startup/tasks/main.yml
index 0d8dfe4..b2ef75a 100644
--- a/roles/product_startup/tasks/main.yml
+++ b/roles/product_startup/tasks/main.yml
@@ -4,7 +4,9 @@
   template:
     src: "product.service.j2"
     dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
-<<<<<<< HEAD
+    owner: root
+    group: root
+    mode: 0640
   when: atl_product_edition != "crowd"
   notify:
     - Enable Product
@@ -14,12 +16,10 @@
   template:
     src: "crowd.service.j2"
     dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
-  when: atl_product_edition == "crowd"
-=======
     owner: root
     group: root
     mode: 0640
->>>>>>> origin/master
+  when: atl_product_edition == "crowd"
   notify:
     - Enable Product
     - Restart Product