diff --git a/terraform/gitops/generate-files/templates/pm4ml/istio-gateway.yaml.tpl b/terraform/gitops/generate-files/templates/pm4ml/istio-gateway.yaml.tpl
index 187e3c766..f5d30ada8 100644
--- a/terraform/gitops/generate-files/templates/pm4ml/istio-gateway.yaml.tpl
+++ b/terraform/gitops/generate-files/templates/pm4ml/istio-gateway.yaml.tpl
@@ -164,12 +164,11 @@ spec:
             host: ${pm4ml_release_name}-experience-api
             port:
               number: 80
-          # TODO - check why these headers are applied twice when the following is uncommented
-          # headers:
-          #   response:
-          #     add:
-          #       access-control-allow-origin: "https://${portal_fqdn}"
-          #       access-control-allow-credentials: "true"
+          headers:
+            response:
+              add:
+                access-control-allow-origin: "https://${portal_fqdn}"
+                access-control-allow-credentials: "true"
 
 ---
 apiVersion: security.istio.io/v1beta1
diff --git a/terraform/gitops/generate-files/templates/pm4ml/values-pm4ml.yaml.tpl b/terraform/gitops/generate-files/templates/pm4ml/values-pm4ml.yaml.tpl
index b4bfa9c47..356bebf9b 100644
--- a/terraform/gitops/generate-files/templates/pm4ml/values-pm4ml.yaml.tpl
+++ b/terraform/gitops/generate-files/templates/pm4ml/values-pm4ml.yaml.tpl
@@ -249,8 +249,8 @@ ttk:
             ],
         }
       rules_response__default.json: https://raw.githubusercontent.com/mojaloop/testing-toolkit-test-cases/v16.1.0-fx-snapshot.1/rules/pm4ml/fxp_response_rules.json
-      api_definitions__mojaloop_connector_backend_2.1__api_spec.yaml: "https://raw.githubusercontent.com/mojaloop/api-snippets/v17.4.0/docs/sdk-scheme-adapter-backend-v2_1_0-openapi3-snippets.yaml"
-      api_definitions__mojaloop_connector_outbound_2.1__api_spec.yaml: "https://raw.githubusercontent.com/mojaloop/api-snippets/main/docs/sdk-scheme-adapter-outbound-v2_1_0-openapi3-snippets.yaml"
+      api_definitions__mojaloop_connector_backend_2.1__api_spec.yaml: "https://raw.githubusercontent.com/mojaloop/api-snippets/v17.7.0/docs/sdk-scheme-adapter-backend-v2_1_0-openapi3-snippets.yaml"
+      api_definitions__mojaloop_connector_outbound_2.1__api_spec.yaml: "https://raw.githubusercontent.com/mojaloop/api-snippets/v17.7.0/docs/sdk-scheme-adapter-outbound-v2_1_0-openapi3-snippets.yaml"
       api_definitions__mojaloop_connector_outbound_2.1__callback_map.json: []
     extraEnvironments:
       pm4ml-default-environment.json: {