diff --git a/gcube/authorization_service/templates/AuthorizationConfiguration.xml.j2 b/gcube/authorization_service/templates/AuthorizationConfiguration.xml.j2
index 783c1f1..269d41c 100644
--- a/gcube/authorization_service/templates/AuthorizationConfiguration.xml.j2
+++ b/gcube/authorization_service/templates/AuthorizationConfiguration.xml.j2
@@ -4,9 +4,21 @@
     {% for ip in authorized_ips %}
     <Entity type="IP" value="{{ ip }}" />
     {% endfor %}
-        </Rule>
-        <Rule path="/apikey" requiresToken="true"/>
-        <Rule path="/policyManager" requiresToken="true"/>
-        <Rule path="/token/external" requiresToken="true"/>
+  </Rule>
+
+  <Rule path="/apikey" requiresToken="true" acceptedTokenTypes="USER"/>
+  <Rule path="/policyManager" requiresToken="true">
+    {% for ip in authorized_ips %}
+    <Entity type="IP" value="{{ ip }}" />
+    {% endfor %}
+  </Rule>
+  <Rule path="/token/external" requiresToken="true" acceptedTokenTypes="USER" />
+  <Rule path="/token/node" requiresToken="false" />
+  <Rule path="/token/service" requiresToken="true" acceptedTokenTypes="CONTAINER"/>
+  <Rule path="/token/resolve" requiresToken="false">
+    {% for ip in authorized_ips %}
+    <Entity type="IP" value="{{ ip }}" />
+    {% endfor %}
+  </Rule>
 </Configuration>