diff --git a/openapitools.json b/openapitools.json
new file mode 100644
index 00000000..4053ae89
--- /dev/null
+++ b/openapitools.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
+  "spaces": 2,
+  "generator-cli": {
+    "version": "7.0.1"
+  }
+}
diff --git a/package.json b/package.json
index ef4b3481..8ff70ab0 100644
--- a/package.json
+++ b/package.json
@@ -17,4 +17,4 @@
     "license-checker": "^25.0.1",
     "minimist": "^1.2.2"
   }
-}
+}
\ No newline at end of file
diff --git a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml
index 022d2d6c..a500ec82 100644
--- a/proxies/live/apiproxy/policies/AssignMessage.Targets.xml
+++ b/proxies/live/apiproxy/policies/AssignMessage.Targets.xml
@@ -1,7 +1,8 @@
-<AssignMessage name='AssignMessage.Targets'>
-  <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
-  <AssignVariable>
-    <Name>targets</Name>
-    <Ref>private.config_raw.content</Ref>
-  </AssignVariable>
-</AssignMessage>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<AssignMessage name="AssignMessage.Targets">
+    <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
+    <AssignVariable>
+        <Name>targets</Name>
+        <Ref>private.config_raw.content</Ref>
+    </AssignVariable>
+</AssignMessage>
\ No newline at end of file
diff --git a/proxies/live/apiproxy/policies/KVM.GetTargets.xml b/proxies/live/apiproxy/policies/KVM.GetTargets.xml
new file mode 100644
index 00000000..77bf349a
--- /dev/null
+++ b/proxies/live/apiproxy/policies/KVM.GetTargets.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<KeyValueMapOperations async="false" continueOnError="false" enabled="true" name="KVM.GetTargets" mapIdentifier="booking-and-referrals-targets">
+    <DisplayName>KVM.GetTargets</DisplayName>
+    <ExclusiveCache>false</ExclusiveCache>
+    <ExpiryTimeInSecs>300</ExpiryTimeInSecs>
+    <Get assignTo="target_domain">
+        <Key>
+            <Parameter>target-domain</Parameter>
+        </Key>
+    </Get>
+    <Get assignTo="target_path">
+        <Key>
+            <Parameter>target-path</Parameter>
+        </Key>
+    </Get>
+</KeyValueMapOperations>
\ No newline at end of file
diff --git a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml
index 29f8bf56..776ccb2f 100644
--- a/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml
+++ b/proxies/live/apiproxy/policies/ServiceCallout.GetTargetsKvm.xml
@@ -1,18 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ServiceCallout async="false" continueOnError="false" enabled="true" name="ServiceCallout.GetTargetsKvm">
-  <!-- This is the default (55 seconds). Including it to make explicit. -->
-  <Timeout>55000</Timeout>
-  <Request>
-    <Set>
-      <Verb>GET</Verb>
-      <Path>NHSDigital/booking-and-referral-targets/master/targets/{{ APIGEE_ENVIRONMENT }}/targets.json</Path>
-    </Set>
-    <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
-  </Request>
-  <Response>private.config_raw</Response>
-  <HTTPTargetConnection>
-    <SSLInfo>
-      <Enabled>true</Enabled>
-    </SSLInfo>
-    <URL>https://raw.githubusercontent.com</URL>
-  </HTTPTargetConnection>
-</ServiceCallout>
+    <Timeout>55000</Timeout>
+    <Request>
+        <Set>
+            <Verb>GET</Verb>
+            <Path>{target_path}</Path>
+            <IgnoreUnresolvedVariables>false</IgnoreUnresolvedVariables>
+        </Set>
+    </Request>
+    <Response>private.config_raw</Response>
+    <HTTPTargetConnection>
+        <SSLInfo>
+            <Enabled>true</Enabled>
+        </SSLInfo>
+        <URL>https://{target_domain}</URL>
+    </HTTPTargetConnection>
+</ServiceCallout>
\ No newline at end of file
diff --git a/proxies/live/apiproxy/resources/jsc/UnpackVars.js b/proxies/live/apiproxy/resources/jsc/UnpackVars.js
index 046cc9e0..5751c79a 100644
--- a/proxies/live/apiproxy/resources/jsc/UnpackVars.js
+++ b/proxies/live/apiproxy/resources/jsc/UnpackVars.js
@@ -1,3 +1,3 @@
 
 var bookingReferralConfig =  JSON.parse(context.getVariable("targets"));
-set_variables("booking-and-referral-config", bookingReferralConfig)
+set_variables("booking-and-referral-config", bookingReferralConfig);
\ No newline at end of file
diff --git a/proxies/live/apiproxy/targets/bref-target.xml b/proxies/live/apiproxy/targets/bref-target.xml
index 7e684ad8..a31332c7 100644
--- a/proxies/live/apiproxy/targets/bref-target.xml
+++ b/proxies/live/apiproxy/targets/bref-target.xml
@@ -1,70 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <TargetEndpoint name="booking-and-referral-target">
-  <PreFlow>
-    <Request>
-      <Step>
-        <Name>LookupCache.Targets</Name>
-      </Step>
-      <Step>
-        <Name>Python.DecodeBase64</Name>
-        <Condition>request.header.NHSD-Target-Identifier != null</Condition>
-      </Step>
-      <Step>
-        <Name>Javascript.UnpackVars</Name>
-        <Condition>targets != null</Condition>
-      </Step>
-      <Step>
-        <Name>Javascript.CheckTargets</Name>
-        <Condition>targets != null</Condition>
-      </Step>
-      <Step>
-        <Name>ServiceCallout.GetTargetsKvm</Name>
-        <Condition>targets = null</Condition>
-      </Step>
-      <Step>
-        <Name>PopulateCache.Targets</Name>
-        <Condition>targets = null</Condition>
-      </Step>
-      <Step>
-        <Name>AssignMessage.Targets</Name>
-        <Condition>targets = null</Condition>
-      </Step>
-      <Step>
-        <Name>Javascript.UnpackVars</Name>
-      </Step>
-      <Step>
-        <Name>Javascript.SetTargetUrl</Name>
-      </Step>
-      <Step>
-        <Name>RaiseFault.400MalformedTargetIdentifier</Name>
-        <Condition>idMalformed = true</Condition>
-      </Step>
-      <Step>
-        <Name>RaiseFault.404ProxyNotFound</Name>
-        <Condition>isError = true</Condition>
-      </Step>
-    </Request>
-  </PreFlow>
-  <DefaultFaultRule>
-    <Step>
-      <Name>ExtractVariables.OperationOutcomeCode</Name>
-    </Step>
-    <Step>
-      <Name>Javascript.HandleErrors</Name>
-    </Step>
-    <Step>
-      <Name>AssignMessage.SetErrorResponse</Name>
-    </Step>
-  </DefaultFaultRule>
-  <HTTPTargetConnection>
+    <PreFlow>
+        <Request>
+            <Step>
+                <Name>LookupCache.Targets</Name>
+            </Step>
+            <Step>
+                <Name>Python.DecodeBase64</Name>
+                <Condition>request.header.NHSD-Target-Identifier != null</Condition>
+            </Step>
+            <Step>
+                <Name>Javascript.UnpackVars</Name>
+                <Condition>targets != null</Condition>
+            </Step>
+            <Step>
+                <Name>Javascript.CheckTargets</Name>
+                <Condition>targets != null</Condition>
+            </Step>
+            <Step>
+                <Name>KVM.GetTargets</Name>
+                <Condition>targets = null</Condition>
+            </Step>
+            <Step>
+                <Name>ServiceCallout.GetTargetsKvm</Name>
+                <Condition>targets = null</Condition>
+            </Step>
+            <Step>
+                <Name>PopulateCache.Targets</Name>
+                <Condition>targets = null</Condition>
+            </Step>
+            <Step>
+                <Name>AssignMessage.Targets</Name>
+                <Condition>targets = null</Condition>
+            </Step>
+            <Step>
+                <Name>Javascript.UnpackVars</Name>
+            </Step>
+            <Step>
+                <Name>Javascript.SetTargetUrl</Name>
+            </Step>
+            <Step>
+                <Name>RaiseFault.400MalformedTargetIdentifier</Name>
+                <Condition>idMalformed = true</Condition>
+            </Step>
+            <Step>
+                <Name>RaiseFault.404ProxyNotFound</Name>
+                <Condition>isError = true</Condition>
+            </Step>
+        </Request>
+    </PreFlow>
+    <DefaultFaultRule>
+        <Step>
+            <Name>ExtractVariables.OperationOutcomeCode</Name>
+        </Step>
+        <Step>
+            <Name>Javascript.HandleErrors</Name>
+        </Step>
+        <Step>
+            <Name>AssignMessage.SetErrorResponse</Name>
+        </Step>
+    </DefaultFaultRule>
+    <HTTPTargetConnection>
         <Properties>
             <Property name="io.timeout.millis">32000</Property>
         </Properties>
-    <URL>https://mocktarget.apigee.net</URL>
-    <SSLInfo>
-      <Enabled>true</Enabled>
-      <ClientAuthEnabled>true</ClientAuthEnabled>
-      <KeyStore>ref://bars-client</KeyStore>
-      <KeyAlias>cert</KeyAlias>
-    </SSLInfo>
-  </HTTPTargetConnection>
-</TargetEndpoint>
+        <URL>https://mocktarget.apigee.net</URL>
+        <SSLInfo>
+            <Enabled>true</Enabled>
+            <ClientAuthEnabled>true</ClientAuthEnabled>
+            <KeyStore>ref://bars-client</KeyStore>
+            <KeyAlias>cert</KeyAlias>
+        </SSLInfo>
+    </HTTPTargetConnection>
+</TargetEndpoint>
\ No newline at end of file