diff --git a/smartgears/smartgears/defaults/main.yml b/smartgears/smartgears/defaults/main.yml
index 75677ede..87720fbd 100644
--- a/smartgears/smartgears/defaults/main.yml
+++ b/smartgears/smartgears/defaults/main.yml
@@ -21,11 +21,8 @@ smartgears_file: 'smartgears-distribution-{{ smartgears_distribution_version }}.
 smartgears_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}/org/gcube/distribution/smartgears-distribution/{{ smartgears_distribution_version }}/{{ smartgears_file }}'
 smartgears_mode: online
 smartgears_application_mode: online
-# Production infra and VO
+# Production infra
 smartgears_infrastructure_name: "d4science.research-infrastructures.eu"
-smartgears_vo: True
-smartgears_vo_name:
-  - gCubeApps
 smartgears_hostname: '{{ ansible_fqdn }}'
 smartgears_country: it
 smartgears_location: pisa
@@ -38,15 +35,6 @@ smartgears_service_name: 'tomcat-instance-{{ smartgears_http_port }}'
 smartgears_loglevel: WARN
 
 smartgears_tomcat_contexts: [ 'whn-manager' ]
-smartgears_define_context_vo: False
-smartgears_define_context_root_vo: False
-smartgears_context:
-  - name: '/smart-executor'
-    scopes:
-      - ''
-      - '/BiodiversityLab'
-      - '/BiOnym'
-      - '/ScalableDataMining'
 
 smartgears_scopes:
   - '/{{ smartgears_infrastructure_name }}'
diff --git a/smartgears/smartgears/templates/container.xml.j2 b/smartgears/smartgears/templates/container.xml.j2
index b84bb3f9..d0845d94 100644
--- a/smartgears/smartgears/templates/container.xml.j2
+++ b/smartgears/smartgears/templates/container.xml.j2
@@ -29,27 +29,3 @@
   <publication-frequency>{{ smartgears_publication_frequency }}</publication-frequency>
   <infrastructure>{{ smartgears_infrastructure_name }}</infrastructure>
 
-  {% if smartgears_distribution_version | version_compare('2.0.0', '<') %}
-  {% if smartgears_vo %}
-  {% for vo_n in smartgears_vo_name %}
-  <vo>{{ vo_n }}</vo>
-  {% endfor %}
-  {% endif %}
-    
-  {% if smartgears_define_context_vo %}
-  {% for context in smartgears_context %}
-
-  <application mode="{{ smartgears_application_mode }}" context="{{ context.name }}">
-    {% if smartgears_define_context_root_vo %}
-    <scope>/{{ smartgears_infrastructure_name }}</scope>
-    {% endif %}
-    {% for vo_n in smartgears_vo_name %}
-    {% for vo_scope in context.scopes %}
-    <scope>/{{ smartgears_infrastructure_name }}/{{ vo_n }}{{ vo_scope }}</scope>
-    {% endfor %}
-    {% endfor %}
-  </application>
-  {% endfor %}
-  {% endif %}
-  
-{% endif %}