diff --git a/smartgears/smart_executor/defaults/main.yml b/smartgears/smart_executor/defaults/main.yml
index a522af7..fccdbbc 100644
--- a/smartgears/smart_executor/defaults/main.yml
+++ b/smartgears/smart_executor/defaults/main.yml
@@ -6,17 +6,3 @@ smart_executor_name: smart-executor
 smart_executor_file: '{{ smart_executor_name }}-{{ smart_executor_version }}.war'
 smart_executor_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}/org/gcube/vremanagement/smart-executor/{{ smart_executor_version }}/{{ smart_executor_file }}'
 
-smart_executor_context: '/{{ smart_executor_name }}'
-smart_executor_contexts_list:
-  - ''
-  - '/BiodiversityLab'
-  - '/BiOnym'
-  - '/ScalableDataMining'
-
-# dev has two different contexts
-#smart_executor_contexts_list:
-#  - ''
-#  - '/devVRE'
-
-#  - ''
-#  - '/NextNext'
diff --git a/smartgears/smartgears/defaults/main.yml b/smartgears/smartgears/defaults/main.yml
index 899005e..dde232c 100644
--- a/smartgears/smartgears/defaults/main.yml
+++ b/smartgears/smartgears/defaults/main.yml
@@ -32,6 +32,22 @@ smartgears_service_name: 'tomcat-instance-{{ smartgears_http_port }}'
 
 smartgears_loglevel: WARN
 
+smartgears_define_context_vo: False
+smartgears_context: '/smart-executor'
+smartgears_contexts_list:
+  - ''
+  - '/BiodiversityLab'
+  - '/BiOnym'
+  - '/ScalableDataMining'
+
+# dev has two different contexts
+#smart_executor_contexts_list:
+#  - ''
+#  - '/devVRE'
+
+#  - ''
+#  - '/NextNext'
+
 # The iptables rules use this
 http_port: '{{ smartgears_http_port }}'
 
diff --git a/smartgears/smartgears/templates/container.xml.j2 b/smartgears/smartgears/templates/container.xml.j2
index 0f67989..dd824f6 100644
--- a/smartgears/smartgears/templates/container.xml.j2
+++ b/smartgears/smartgears/templates/container.xml.j2
@@ -25,10 +25,10 @@
 	<property name='SmartGearsDistributionBundle' value='UnBundled' />
     <property name='SmartGearsDistribution' value='{{ smartgears_distribution_version }}' />
 	<publication-frequency>60</publication-frequency>
-{% if smart_executor_install is defined and smart_executor_install %}
+{% if smartgears_define_context_vo %}
 
-  <application mode="{{ smartgears_mode }}" context="{{ smart_executor_context }}">
-{% for context in smart_executor_contexts_list %}
+  <application mode="{{ smartgears_mode }}" context="{{ smartgears_context }}">
+{% for context in smartgears_contexts_list %}
     <scope>/{{ smartgears_infrastructure_name }}/{{ smartgears_vo_name }}{{ context }}</scope>
 {% endfor %}
   </application>