diff --git a/smartgears/gcubeapp-setup/tasks/main.yml b/smartgears/gcubeapp-setup/tasks/main.yml
index 4b799b70..7a54d3d5 100644
--- a/smartgears/gcubeapp-setup/tasks/main.yml
+++ b/smartgears/gcubeapp-setup/tasks/main.yml
@@ -1,13 +1,13 @@
 ---
 - 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.context }}/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.webapp_context }}/WEB-INF/gcube-app.xml owner={{ smartgears_user }} group={{ smartgears_user }}
   with_items: '{{ gcubeapp_webapps | default([]) }}'
   notify: Restart smartgears
   when: gcubeapp_setup
   tags: [ 'smartgears', 'gcubeapp' ]
 
 - name: Install the gcube-handlers.xml file to manage the smartgears filters
-  template: src=gcube-handlers.xml.j2 dest={{ item.webapp_path | default('/home/gcube/tomcat') }}/webapps/{{ item.context }}/WEB-INF/gcube-handlers.xml owner={{ smartgears_user }} group={{ smartgears_user }}
+  template: src=gcube-handlers.xml.j2 dest={{ item.webapp_path | default('/home/gcube/tomcat') }}/webapps/{{ item.webapp_context }}/WEB-INF/gcube-handlers.xml owner={{ smartgears_user }} group={{ smartgears_user }}
   with_items: '{{ gcubeapp_webapps | default([]) }}'
   notify: Restart smartgears
   when: gcubehandlers_setup