diff --git a/templates/record_context_to_is.json.j2 b/templates/record_context_to_is.json.j2
index 42ea8b4..71eb9cc 100644
--- a/templates/record_context_to_is.json.j2
+++ b/templates/record_context_to_is.json.j2
@@ -70,7 +70,7 @@
             "taskReferenceName" : "extract_infrastructure_id",
             "type" : "SIMPLE",
             "inputParameters" : {
-              "code" : "exec('import xml.etree.ElementTree as ET') or list(map(lambda n: n.text, ET.fromstring(data['xmlstring']).findall('Resource/Profile/[SecondaryType=\\'INFRASTRUCTURE\\'][Name=\\'VirtualOrganisation\\']/../ID')))",
+              "code" : "exec('import xml.etree.ElementTree as ET') or list(map(lambda n: n.text, ET.fromstring(data['xmlstring']).findall('Resource/Profile/Body/infrastructures/infrastructure/vos/vo[scope=\\'${init.output.result.decoded_root_vo}/${init.output.result.parent}\\'].id')))",
               "xmlstring" : "${retrieve_infrastructure.output.body}"
             }
           }
@@ -143,8 +143,8 @@
         "method": "PUT",
         "headers": {
           "Authorization": "Bearer ${authorize_uma_rootvo.output.body.access_token}",
-          "Accept": "application/json",
-          "Content-Type": "application/json"
+          "Content-Type": "application/json",
+          "Accept" : "application/json"
         },
         "body": {
           "type": "Context",