diff --git a/geonetwork/geonetwork/defaults/main.yml b/geonetwork/geonetwork/defaults/main.yml
index ba342997..ef51bc18 100644
--- a/geonetwork/geonetwork/defaults/main.yml
+++ b/geonetwork/geonetwork/defaults/main.yml
@@ -3,7 +3,7 @@ geonetwork_install: False
 geonetwork_upgrade: False
 geonetwork_major_version: '2.6'
 geonetwork_minor_version: 0
-geonetwork_app_name: geonetwork
+geonetwork_app_name: GeoNetwork
 geonetwork_version: '{{ geonetwork_major_version }}.{{ geonetwork_minor_version }}'
 geonetwork_download_url: 'https://downloads.sourceforge.net/project/geonetwork/GeoNetwork_opensource/v{{ geonetwork_version }}/geonetwork.war?r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Fgeonetwork%2Ffiles%2FGeoNetwork_opensource%2Fv{{ geonetwork_version  }}%2F&ts=1485267039&use_mirror=netcologne'
 
diff --git a/geoserver/geoserver/defaults/main.yml b/geoserver/geoserver/defaults/main.yml
index 00b08a77..762a74a2 100644
--- a/geoserver/geoserver/defaults/main.yml
+++ b/geoserver/geoserver/defaults/main.yml
@@ -2,7 +2,7 @@
 geoserver_install: False
 geoserver_major_version: '2.10'
 geoserver_minor_version: 3
-geoserver_app_name: geoserver
+geoserver_app_name: GeoServer
 geoserver_version: '{{ geoserver_major_version }}.{{ geoserver_minor_version }}'
 geoserver_download_url: 'http://sourceforge.net/projects/geoserver/files/GeoServer/{{ geoserver_version }}/geoserver-{{ geoserver_version }}-war.zip'
 
diff --git a/geoserver/geoserver/tasks/geoserver-gcubeapp.yml b/geoserver/geoserver/tasks/geoserver-gcubeapp.yml
deleted file mode 100644
index 6ca8dbd4..00000000
--- a/geoserver/geoserver/tasks/geoserver-gcubeapp.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Install the gcube-app file to make geoserver smartgears compatible
-  template: src=gcube-app.xml.j2 dest={{ item.instance_path }}/webapps/{{ geoserver_app_name }}/WEB-INF/gcube-app.xml owner={{ item.user }} group={{ item.user }}
-  with_items: '{{ tomcat_m_instances }}'
-  notify: tomcat instances restart 
-  when: geoserver_install
-  tags: geoserver
-
diff --git a/geoserver/geoserver/tasks/main.yml b/geoserver/geoserver/tasks/main.yml
index 5ef128e9..7fe126b0 100644
--- a/geoserver/geoserver/tasks/main.yml
+++ b/geoserver/geoserver/tasks/main.yml
@@ -1,4 +1,2 @@
 ---
 - include: geoserver.yml
-# - include: geoserver-gcubeapp.yml
-#   when: smartgears_node is defined and smartgears_node
diff --git a/geoserver/geoserver/templates/gcube-app.xml.j2 b/geoserver/geoserver/templates/gcube-app.xml.j2
deleted file mode 100644
index 4adf403c..00000000
--- a/geoserver/geoserver/templates/gcube-app.xml.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-<application mode="online">
-
-        <name>{{ smartgears_gcube_app_name }}</name>
-        <group>{{ smartgears_gcube_app_group }}</group>
-        <version>1.0</version>
-{% if smartgears_persistence_location is defined %}
-        <persistence location="{{ smartgears_persistence_location }}"/>
-{% endif %}
-        <exclude>/*</exclude>
-
-</application>
-
diff --git a/smartgears/gcubeapp-setup/defaults/main.yml b/smartgears/gcubeapp-setup/defaults/main.yml
index 0e0df775..a3697411 100644
--- a/smartgears/gcubeapp-setup/defaults/main.yml
+++ b/smartgears/gcubeapp-setup/defaults/main.yml
@@ -2,6 +2,6 @@
 gcubeapp_setup: False
 
 #gcubeapp_webapps:
-#  - { webapp_path: '', webapp_name: '', version: '', webapp_group: '', description: '', exclude_handlers: [ '' ] }
+#  - { webapp_context: '', webapp_name: '', version: '', webapp_group: '', description: '', exclude_handlers: [ '' ] }
 
   
diff --git a/smartgears/gcubeapp-setup/tasks/main.yml b/smartgears/gcubeapp-setup/tasks/main.yml
index a008b25c..bc7e2426 100644
--- a/smartgears/gcubeapp-setup/tasks/main.yml
+++ b/smartgears/gcubeapp-setup/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install the gcube-app file to make the webapp smartgears compatible
-  template: src=gcube-app.xml.j2 dest={{ item.webapp_path | default('/home/gcube/tomcat') }}/webapps/{{ item.webapp_name }}/WEB-INF/gcube-app.xml owner={{ smartgears_user }} group={{ smartgears_user }}
+  template: src=gcube-app.xml.j2 dest={{ item.webapp_path | default('/home/gcube/tomcat') }}/webapps/{{ item.context }}/WEB-INF/gcube-app.xml owner={{ smartgears_user }} group={{ smartgears_user }}
   with_items: '{{ gcubeapp_webapps | default (omit) }}'
   notify: Restart smartgears
   when: gcubeapp_setup
diff --git a/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2 b/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2
index 752875ef..46c73f57 100644
--- a/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2
+++ b/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2
@@ -1,4 +1,4 @@
-<application mode="online">
+<application mode="{{ smartgears_application_mode }}">
 
         <name>{{ item.webapp_name }}</name>
         <group>{{ item.webapp_group }}</group>