diff --git a/geonetwork/geonetwork/tasks/main.yml b/geonetwork/geonetwork/tasks/main.yml
index 276e7ebe..2968a56f 100644
--- a/geonetwork/geonetwork/tasks/main.yml
+++ b/geonetwork/geonetwork/tasks/main.yml
@@ -8,7 +8,7 @@
       with_items: '{{ tomcat_m_instances }}'
       
     - name: Remove the geonetwork webapp if we are upgrading
-      file: dest={{ item.instance_path }}/webapps/{{ geonetwork_app_name }} state=absent
+      file: dest={{ item.instance_path }}/webapps/{{ geonetwork_app_name | lower  }} state=absent
       with_items: '{{ tomcat_m_instances }}'
       when: geonetwork_upgrade
 
@@ -25,9 +25,9 @@
       register: geonetwork_download
 
     - name: Remove the geonetwork webapp if we downloaded a new version
-      file: dest={{ item.instance_path }}/webapps/{{ geonetwork_app_name }} state=absent
+      file: dest={{ item.instance_path }}/webapps/{{ geonetwork_app_name  | lower  }} state=absent
       with_items: '{{ tomcat_m_instances }}'
-      when: ( geonetwork_download | changed )
+      when: ( geonetwork_download is changed )
 
     - name: Unpack the Geonetwork war file
       unarchive: copy=no src={{ geonetwork_download_directory }}/geonetwork.{{ geonetwork_version }}.war dest={{ item.instance_path }}/webapps/{{ geonetwork_app_name | lower }} creates={{ item.instance_path }}/webapps/{{ geonetwork_app_name | lower }}/WEB-INF/lib owner={{ item.user }} group={{ item.user }}