diff --git a/smartgears/smartgears/defaults/main.yml b/smartgears/smartgears/defaults/main.yml
index 5209b368..1c95bf6f 100644
--- a/smartgears/smartgears/defaults/main.yml
+++ b/smartgears/smartgears/defaults/main.yml
@@ -28,6 +28,9 @@ smartgears_vo_name:
 smartgears_hostname: '{{ ansible_fqdn }}'
 smartgears_country: it
 smartgears_location: pisa
+smartgears_latitude: 41.9000
+smartgears_longitude: 12.5000
+
 
 smartgears_http_port: 9000
 smartgears_service_name: 'tomcat-instance-{{ smartgears_http_port }}'
@@ -36,6 +39,7 @@ smartgears_loglevel: WARN
 
 smartgears_tomcat_contexts: [ 'whn-manager' ]
 smartgears_define_context_vo: False
+smartgears_define_context_root_vo: True
 smartgears_context: '/smart-executor'
 smartgears_contexts_list:
   - ''
diff --git a/smartgears/smartgears/templates/container.xml.j2 b/smartgears/smartgears/templates/container.xml.j2
index d49b8f49..bf11a163 100644
--- a/smartgears/smartgears/templates/container.xml.j2
+++ b/smartgears/smartgears/templates/container.xml.j2
@@ -11,6 +11,7 @@
     <port>{{ item.http_port }}</port>
 {% endif %}
 	<infrastructure>{{ smartgears_infrastructure_name }}</infrastructure>
+
     {% if smartgears_vo %}
     {% for vo_n in smartgears_vo_name %}
 	<vo>{{ vo_n }}</vo>
@@ -20,8 +21,8 @@
 	<site>
 		<country>{{ smartgears_country }}</country>
 		<location>{{ smartgears_location }}</location>
-		<latitude>41.9000</latitude>
-		<longitude>12.5000</longitude>
+		<latitude>{{ smartgears_latitude }}</latitude>
+		<longitude>{{ smartgears_longitude }}</longitude>
 	</site>
 
 	<property name='SmartGearsDistributionBundle' value='UnBundled' />
@@ -30,11 +31,17 @@
 
 {% if smartgears_define_context_vo %}
   <application mode="{{ smartgears_application_mode }}" context="{{ smartgears_context }}">
+
+    {% if smartgears_define_context_root_vo %}
+    <scope>/{{ smartgears_infrastructure_name }}</scope>
+    {% endif %}
+
     {% for vo_n in smartgears_vo_name %}
     {% for context in smartgears_contexts_list %}
     <scope>/{{ smartgears_infrastructure_name }}/{{ vo_n }}{{ context }}</scope>
     {% endfor %}
     {% endfor %}
+
   </application>
 
 {% endif %}