diff --git a/geoserver/geoserver/tasks/geoserver.yml b/geoserver/geoserver/tasks/geoserver.yml
index 0b8e4276..4371768d 100644
--- a/geoserver/geoserver/tasks/geoserver.yml
+++ b/geoserver/geoserver/tasks/geoserver.yml
@@ -4,29 +4,29 @@
       file: path={{ geoserver_download_directory }} state=directory
 
     - name: Create the Geoserver webapp directory
-      file: path={{ item.instance_path }}/webapps/{{ geoserver_app_name }} state=directory owner={{ item.user }} group={{ item.user }}
+      file: path={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }} state=directory owner={{ item.user }} group={{ item.user }}
       with_items: '{{ tomcat_m_instances }}'
 
     - name: Create the Geoserver data directory
       file: path={{ geoserver_data_directory }} state=directory owner={{ item.user }} group={{ item.user }}
       with_items: '{{ tomcat_m_instances }}'
       
-    - name: Download and unpack the Geoserver file distribution
+    - name: Download the Geoserver file distribution
       unarchive: copy=no src={{ geoserver_download_url }} dest={{ geoserver_download_directory }} creates={{ geoserver_download_directory }}/geoserver.war validate_certs=False
 
     - name: Unpack the Geoserver war file
-      unarchive: copy=no src={{ geoserver_download_directory }}/geoserver.war dest={{ item.instance_path }}/webapps/{{ geoserver_app_name }} creates={{ item.instance_path }}/webapps/{{ geoserver_app_name }}/WEB-INF/lib owner={{ item.user }} group={{ item.user }}
+      unarchive: copy=no src={{ geoserver_download_directory }}/geoserver.war dest={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }} creates={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib owner={{ item.user }} group={{ item.user }}
       with_items: '{{ tomcat_m_instances }}'
       notify: tomcat instances restart
 
     - name: Remove the postgres jdbc driver when we want a JNDI profile
-      shell: rm -f {{ item.instance_path }}/webapps/{{ geoserver_app_name }}/WEB-INF/lib/postgresql*.jdbc*.jar
+      shell: rm -f {{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/postgresql*.jdbc*.jar
       with_items: '{{ tomcat_m_instances }}'
       when: tomcat_install_pg_jdbc
       notify: tomcat instances restart
 
     - name: Download newer jar files when needed
-      get_url: url={{ item.1.url }} dest={{ item.0.instance_path }}/webapps/{{ geoserver_app_name }}/WEB-INF/lib/{{ item.1.file }} owner={{ item.0.user }} group={{ item.0.user }} force=yes
+      get_url: url={{ item.1.url }} dest={{ item.0.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/{{ item.1.file }} owner={{ item.0.user }} group={{ item.0.user }} force=yes
       with_together:
         - '{{ tomcat_m_instances }}'
         - '{{ geoserver_patches_data | default (omit) }}'
@@ -39,7 +39,7 @@
 
 - block:
     - name: Remove the Geoserver webapp directory
-      file: path={{ item.instance_path }}/webapps/{{ geoserver_app_name }} state=absent
+      file: path={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }} state=absent
       with_items: '{{ tomcat_m_instances }}'
       notify: tomcat instances restart
 
diff --git a/geoserver/spatialite/tasks/main.yml b/geoserver/spatialite/tasks/main.yml
index f574f15b..0ec28d5d 100644
--- a/geoserver/spatialite/tasks/main.yml
+++ b/geoserver/spatialite/tasks/main.yml
@@ -5,7 +5,7 @@
       with_items: '{{ geoserver_spatial_dpkg_requirements }}'
       
     - name: Download and unpack the Geoserver spatialite extension
-      unarchive: copy=no src={{ geoserver_spatial_url }} dest={{ item.instance_path }}/webapps/{{ geoserver_app_name }}/WEB-INF/lib/ creates={{ item.instance_path }}/webapps/{{ geoserver_app_name }}/WEB-INF/lib/spatialite-jdbc-3.7.2-2.4.jar owner={{ item.user }} group={{ item.user }}
+      unarchive: copy=no src={{ geoserver_spatial_url }} dest={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/ creates={{ item.instance_path }}/webapps/{{ geoserver_app_name | lower }}/WEB-INF/lib/spatialite-jdbc-3.7.2-2.4.jar owner={{ item.user }} group={{ item.user }}
       with_items: '{{ tomcat_m_instances }}'
       notify: tomcat instances restart