diff --git a/capif/.gitlab-ci.yml b/capif/.gitlab-ci.yml
index 7c6935a31059b91b3836959db34f09d01597b5ba..0f8e33b3a0516d20815e7f1c3defb67b133d5c0f 100644
--- a/capif/.gitlab-ci.yml
+++ b/capif/.gitlab-ci.yml
@@ -598,7 +598,7 @@ deploy_ocf_main:
       --set otelcollector.configMap.tempoEndpoint=ocf-main-tempo:4317 \
       --set ocf-access-control-policy.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api \
       --set ocf-access-control-policy.image.tag=$CI_COMMIT_REF_SLUG \
-      --set ocf-access-control-policy.image.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \
+      --set ocf-access-control-policy.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \
       --set ocf-access-control-policy.monitoring="true" \
       --set ocf-access-control-policy.env.logLevel="INFO" \
       --set ocf-api-invocation-logs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api \
@@ -612,6 +612,7 @@ deploy_ocf_main:
       --set ocf-api-invoker-management.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api \
       --set ocf-api-invoker-management.image.tag=$CI_COMMIT_REF_SLUG \
       --set ocf-api-invoker-management.env.monitoring="true" \
+      --set ocf-api-invoker-management.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \
       --set ocf-api-invoker-management.env.vaultHostname=$VAULT_HOSTNAME \
       --set ocf-api-invoker-management.env.vaultPort=$VAULT_PORT \
       --set ocf-api-invoker-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
@@ -619,6 +620,7 @@ deploy_ocf_main:
       --set ocf-api-provider-management.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api \
       --set ocf-api-provider-management.image.tag=$CI_COMMIT_REF_SLUG \
       --set ocf-api-provider-management.env.monitoring="true" \
+      --set ocf-api-provider-management.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \
       --set ocf-api-provider-management.env.vaultHostname=$VAULT_HOSTNAME \
       --set ocf-api-provider-management.env.vaultPort=$VAULT_PORT \
       --set ocf-api-provider-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
@@ -626,6 +628,7 @@ deploy_ocf_main:
       --set ocf-events.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api \
       --set ocf-events.image.tag=$CI_COMMIT_REF_SLUG \
       --set ocf-events.env.monitoring="true" \
+      --set ocf-events.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \
       --set ocf-events.env.logLevel="INFO" \
       --set ocf-routing-info.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api \
       --set ocf-routing-info.image.tag=$CI_COMMIT_REF_SLUG \
@@ -659,6 +662,7 @@ deploy_ocf_main:
       --set ocf-publish-service-api.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api \
       --set ocf-publish-service-api.image.tag=$CI_COMMIT_REF_SLUG \
       --set ocf-publish-service-api.env.monitoring="true" \
+      --set ocf-publish-service-api.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \
       --set ocf-publish-service-api.env.logLevel="INFO" \
       --set ocf-discover-service-api.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api \
       --set ocf-discover-service-api.image.tag=$CI_COMMIT_REF_SLUG \
diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
index b7151189555292c5438f566568c1794262c18526..8530d1f3e5eeb7896ab5759d7036420cc913253c 100644
--- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml
+++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
@@ -131,7 +131,7 @@ deploy_ocf_staging:
       --set otelcollector.configMap.tempoEndpoint=ocf-pre-staging-tempo:4317 \
       --set ocf-access-control-policy.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api \
       --set ocf-access-control-policy.image.tag=$CI_COMMIT_REF_SLUG \
-      --set ocf-access-control-policy.image.env.capifHostname=capif-$CI_ENV_ENDPOINT-mr.$DOMAIN_DEV \
+      --set ocf-access-control-policy.env.capifHostname=capif-$CI_ENV_ENDPOINT-mr.$DOMAIN_DEV \
       --set ocf-access-control-policy.monitoring="true" \
       --set ocf-access-control-policy.env.logLevel="INFO" \
       --set ocf-api-invocation-logs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api \
@@ -145,6 +145,7 @@ deploy_ocf_staging:
       --set ocf-api-invoker-management.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api \
       --set ocf-api-invoker-management.image.tag=$CI_COMMIT_REF_SLUG \
       --set ocf-api-invoker-management.env.monitoring="true" \
+      --set ocf-api-invoker-management.env.capifHostname=capif-$CI_ENV_ENDPOINT-mr.$DOMAIN_DEV \
       --set ocf-api-invoker-management.env.vaultHostname=$VAULT_HOSTNAME \
       --set ocf-api-invoker-management.env.vaultPort=$VAULT_PORT \
       --set ocf-api-invoker-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
@@ -152,6 +153,7 @@ deploy_ocf_staging:
       --set ocf-api-provider-management.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api \
       --set ocf-api-provider-management.image.tag=$CI_COMMIT_REF_SLUG \
       --set ocf-api-provider-management.env.monitoring="true" \
+      --set ocf-api-provider-management.env.capifHostname=capif-$CI_ENV_ENDPOINT-mr.$DOMAIN_DEV \
       --set ocf-api-provider-management.env.vaultHostname=$VAULT_HOSTNAME \
       --set ocf-api-provider-management.env.vaultPort=$VAULT_PORT \
       --set ocf-api-provider-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
@@ -159,6 +161,7 @@ deploy_ocf_staging:
       --set ocf-events.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api \
       --set ocf-events.image.tag=$CI_COMMIT_REF_SLUG \
       --set ocf-events.env.monitoring="true" \
+      --set ocf-events.env.capifHostname=capif-$CI_ENV_ENDPOINT-mr.$DOMAIN_DEV \
       --set ocf-events.env.logLevel="INFO" \
       --set ocf-routing-info.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api \
       --set ocf-routing-info.image.tag=$CI_COMMIT_REF_SLUG \
@@ -192,6 +195,7 @@ deploy_ocf_staging:
       --set ocf-publish-service-api.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api \
       --set ocf-publish-service-api.image.tag=$CI_COMMIT_REF_SLUG \
       --set ocf-publish-service-api.env.monitoring="true" \
+      --set ocf-publish-service-api.env.capifHostname=capif-$CI_ENV_ENDPOINT-mr.$DOMAIN_DEV \
       --set ocf-publish-service-api.env.logLevel="INFO" \
       --set ocf-discover-service-api.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api \
       --set ocf-discover-service-api.image.tag=$CI_COMMIT_REF_SLUG \
diff --git a/capif/templates/cicd-deploy-release.gitlab-ci.yml b/capif/templates/cicd-deploy-release.gitlab-ci.yml
index 9408eb800d6477698c0b7833eca53cfa1271a130..eb36b719a2dcfa2723531adb66963fdf9225fbfe 100644
--- a/capif/templates/cicd-deploy-release.gitlab-ci.yml
+++ b/capif/templates/cicd-deploy-release.gitlab-ci.yml
@@ -165,7 +165,7 @@ prod_build_and_push:
 #      --set otelcollector.configMap.tempoEndpoint=ocf-staging-tempo:4317 \
 #      --set ocf-access-control-policy.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-access-control-policy-api \
 #      --set ocf-access-control-policy.image.tag=staging \
-#      --set ocf-access-control-policy.image.env.capifHostname=capif-staging.$DOMAIN_STAGING \
+#      --set ocf-access-control-policy.env.capifHostname=capif-staging.$DOMAIN_STAGING \
 #      --set ocf-access-control-policy.monitoring="true" \
 #      --set ocf-api-invocation-logs.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-logging-api-invocation-api \
 #      --set ocf-api-invocation-logs.image.tag=staging \
@@ -177,18 +177,21 @@ prod_build_and_push:
 #      --set ocf-api-invoker-management.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-api-invoker-management-api \
 #      --set ocf-api-invoker-management.image.tag=staging \
 #      --set ocf-api-invoker-management.env.monitoring="true" \
+#      --set ocf-api-invoker-management.env.capifHostname=capif-staging.$DOMAIN_STAGING \
 #      --set ocf-api-invoker-management.env.vaultHostname=$VAULT_HOSTNAME \
 #      --set ocf-api-invoker-management.env.vaultPort=$VAULT_PORT \
 #      --set ocf-api-invoker-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
 #      --set ocf-api-provider-management.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-api-provider-management-api \
 #      --set ocf-api-provider-management.image.tag=staging \
 #      --set ocf-api-provider-management.env.monitoring="true" \
+#      --set ocf-api-provider-management.env.capifHostname=capif-staging.$DOMAIN_STAGING \
 #      --set ocf-api-provider-management.env.vaultHostname=$VAULT_HOSTNAME \
 #      --set ocf-api-provider-management.env.vaultPort=$VAULT_PORT \
 #      --set ocf-api-provider-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
 #      --set ocf-events.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-events-api \
 #      --set ocf-events.image.tag=staging \
 #      --set ocf-events.env.monitoring="true" \
+#      --set ocf-events.env.capifHostname=capif-staging.$DOMAIN_STAGING \
 #      --set ocf-routing-info.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-routing-info-api \
 #      --set ocf-routing-info.image.tag=staging \
 #      --set ocf-routing-info.env.monitoring="true" \
@@ -217,6 +220,7 @@ prod_build_and_push:
 #      --set ocf-publish-service-api.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-publish-service-api \
 #      --set ocf-publish-service-api.image.tag=staging \
 #      --set ocf-publish-service-api.env.monitoring="true" \
+#      --set ocf-publish-service-api.env.capifHostname=capif-staging.$DOMAIN_STAGING \
 #      --set ocf-discover-service-api.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-discover-service-api \
 #      --set ocf-discover-service-api.image.tag=staging \
 #      --set ocf-discover-service-api.env.monitoring="true" \