diff --git a/roles/openmrs/meta/main.yml b/roles/openmrs/meta/main.yml
index 03001ab8..df9d1912 100644
--- a/roles/openmrs/meta/main.yml
+++ b/roles/openmrs/meta/main.yml
@@ -13,7 +13,7 @@ dependencies: # noqa 701
   tomcat_system_group: "{{ tomcat_group }}"
   tomcat_user_home: "{{ openmrs_tomcat_user_home }}"
   tomcat_instance: "{{ openmrs_tomcat_instance }}"
-  tomcat_working_directory: "{{ tomcat_user_home }}/.OpenMRS"
+  tomcat_working_directory: "{{ tomcat_user_home }}/{{ tomcat_instance }}"
   tomcat_http_port: "{{ openmrs_tomcat_http_port }}"
   tomcat_shutdown_port: "{{ openmrs_tomcat_shutdown_port }}"
   tomcat_max_filesize: "{{ openmrs_tomcat_max_filesize }}"
diff --git a/roles/opensrp/tasks/compile.yml b/roles/opensrp/tasks/compile.yml
index bd97be58..6179c53a 100644
--- a/roles/opensrp/tasks/compile.yml
+++ b/roles/opensrp/tasks/compile.yml
@@ -17,7 +17,6 @@
   template:
     src: "templates/opensrp_local_checkout_path/configs/assets/config/{{ item }}.properties.j2"
     dest: "{{ opensrp_local_checkout_path }}/configs/assets/config/{{ item }}.properties"
-    
   delegate_to: 127.0.0.1
   with_items:
     - "opensrp"
@@ -28,7 +27,6 @@
   template:
     src: "templates/opensrp_local_checkout_path/opensrp-web/src/main/resources/{{ item }}.properties.j2"
     dest: "{{ opensrp_local_checkout_path }}/src/main/resources//{{ item }}.properties"
-    
   delegate_to: 127.0.0.1
   with_items:
     - "quartz"
@@ -37,7 +35,6 @@
   template:
     src: "templates/opensrp_local_checkout_path/opensrp-web/src/main/resources/spring/{{ item }}.xml.j2"
     dest: "{{ opensrp_local_checkout_path }}/src/main/resources/spring/{{ item }}.xml"
-    
   delegate_to: 127.0.0.1
   with_items:
     - "oauth_clients"
@@ -52,7 +49,6 @@
   - "context"
 
 - name: Compile the OpenSRP WAR # noqa 301
-  
   shell: "cd {{ opensrp_local_checkout_path }} && mvn package -Dmaven.test.skip=true -P {{ opensrp_maven_package_profiles | join(',') }}"
   delegate_to: 127.0.0.1