diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
index d1cf45dea2e5e6def912879b9cf95530823cc763..32b431b00fd5fc90ad67bedf0360b215a8c96387 100644
--- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml
+++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
@@ -62,49 +62,90 @@ deploy_ocf_staging:
       echo "### download dependencies###"
       helm dependency build helm/capif
       echo "### updating capif###"
-      helm upgrade --install -n $NAMESPACE_DEV ocf-pre-staging helm/capif/ --set nginx.nginx.env.capifHostname=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
-      --set nginx.nginx.env.registerHostname=register-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
-      --set monitoring.grafana.ingress.hosts[0].host="grafana-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING" \
-      --set monitoring.grafana.ingress.hosts[0].paths[0].path="/" \
+      helm upgrade --install -n $NAMESPACE_DEV ocf-pre-staging helm/capif/ \
+      --set monitoring.grafana.ingress.hosts[0].host=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+      --set monitoring.grafana.ingress.hosts[0].paths[0].path="/"
       --set monitoring.grafana.ingress.hosts[0].paths[0].pathType="Prefix" \
       --set monitoring.grafana.env.prometheusURL=http://prometheus.ocf.pre-production \
       --set tempo.tempo.metricsGenerator.remoteWriteUrl=http://prometheus.ocf.pre-production/api/v1/write \
-      --set parametersVault.env.vaultHostname=$VAULT_HOSTNAME \
-      --set parametersVault.env.vaultPort=$VAULT_PORT \
-      --set parametersVault.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
-      --set ingress.ip=10.43.107.132 \
-      --set accessControlPolicy.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api \
-      --set accessControlPolicy.image.tag=$CI_COMMIT_REF_SLUG \
-      --set apiInvocationLogs.apiInvocationLogs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api \
-      --set apiInvocationLogs.apiInvocationLogs.image.tag=$CI_COMMIT_REF_SLUG \
-      --set apiInvokerManagement.apiInvokerManagement.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api \
-      --set apiInvokerManagement.apiInvokerManagement.image.tag=$CI_COMMIT_REF_SLUG \
-      --set apiProviderManagement.apiProviderManagement.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api \
-      --set apiProviderManagement.apiProviderManagement.image.tag=$CI_COMMIT_REF_SLUG \
-      --set capifEvents.capifEvents.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api \
-      --set capifEvents.capifEvents.image.tag=$CI_COMMIT_REF_SLUG \
-      --set capifRoutingInfo.capifRoutingInfo.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api \
-      --set capifRoutingInfo.capifRoutingInfo.image.tag=$CI_COMMIT_REF_SLUG \
-      --set capifSecurity.capifSecurity.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api \
-      --set capifSecurity.capifSecurity.image.tag=$CI_COMMIT_REF_SLUG \
-      --set register.register.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register \
-      --set register.register.image.tag=$CI_COMMIT_REF_SLUG \
-      --set logs.logs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api \
-      --set logs.logs.image.tag=$CI_COMMIT_REF_SLUG \
-      --set nignx.nginx.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx \
-      --set nignx.nginx.image.tag=$CI_COMMIT_REF_SLUG \
-      --set publishedApis.publishedApis.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api \
-      --set publishedApis.publishedApis.image.tag=$CI_COMMIT_REF_SLUG \
-      --set serviceApis.serviceApis.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api \
-      --set serviceApis.serviceApis.image.tag=$CI_COMMIT_REF_SLUG \
-      --set nginx.nginx.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx \
-      --set nginx.nginx.image.tag=$CI_COMMIT_REF_SLUG \
-      --set helper.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper \
-      --set helper.image.tag=$CI_COMMIT_REF_SLUG \
-      --set helper.env.vaultHostname=$VAULT_HOSTNAME \
-      --set helper.env.vaultPort=$VAULT_PORT \
-      --set helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
-      --set helper.env.capifHostname=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING  \
+      --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_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+      --set ocf-access-control-policy.monitoring="true" \
+      --set ocf-api-invocation-logs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api \
+      --set ocf-api-invocation-logs.image.tag=$CI_COMMIT_REF_SLUG \
+      --set ocf-api-invocation-logs.env.monitoring="true" \
+      --set ocf-api-invocation-logs.env.capifHostname=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+      --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_HOSTNAME \
+      --set ocf-api-invocation-logs.env.vaultPort=$VAULT_PORT \
+      --set ocf-api-invocation-logs.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --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.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/$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.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/$CI_COMMIT_REF_SLUG/ocf-events-api \
+      --set ocf-events.image.tag=$CI_COMMIT_REF_SLUG \
+      --set ocf-events.env.monitoring="true" \
+      --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 \
+      --set ocf-routing-info.env.monitoring="true" \
+      --set ocf-security.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api \
+      --set ocf-security.image.tag=$CI_COMMIT_REF_SLUG \
+      --set ocf-security.env.monitoring="true" \
+      --set ocf-security.env.capifHostname=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+      --set ocf-security.env.vaultHostname=$VAULT_HOSTNAME \
+      --set ocf-security.env.vaultPort=$VAULT_PORT \
+      --set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set ocf-register.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register \
+      --set ocf-register.image.tag=$CI_COMMIT_REF_SLUG \
+      --set ocf-register.env.vaultHostname=$VAULT_HOSTNAME \
+      --set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set ocf-register.env.vaultPort=$VAULT_PORT \
+      --set ocf-register.env.mongoHost=mongo-register \
+      --set ocf-register.env.mongoPort=27017 \
+      --set ocf-register.ingress.enabled=true \
+      --set ocf-register.ingress.hosts[0].host=register-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+      --set ocf-register.ingress.hosts[0].paths[0].path="/" \
+      --set ocf-register.ingress.hosts[0].paths[0].pathType="Prefix" \
+      --set ocf-auditing-api-logs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api \
+      --set ocf-auditing-api-logs.image.tag=$CI_COMMIT_REF_SLUG \
+      --set ocf-auditing-api-logs.env.monitoring="true" \
+      --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-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 \
+      --set ocf-discover-service-api.env.monitoring="true" \
+      --set nginx.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx \
+      --set nginx.image.tag=$CI_COMMIT_REF_SLUG \
+      --set nginx.env.capifHostname=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+      --set nginx.env.vaultHostname=$VAULT_HOSTNAME \
+      --set nginx.env.vaultPort=$VAULT_PORT \
+      --set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set nginx.ingress.enabled=true \
+      --set nginx.ingress.hosts[0].host=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+      --set nginx.ingress.hosts[0].paths[0].path="/" \
+      --set nginx.ingress.hosts[0].paths[0].pathType="Prefix" \
+      --set ocf-helper.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper \
+      --set ocf-helper.image.tag=$CI_COMMIT_REF_SLUG \
+      --set ocf-helper.env.vaultHostname=$VAULT_HOSTNAME \
+      --set ocf-helper.env.vaultPort=$VAULT_PORT \
+      --set ocf-helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set ocf-helper.env.capifHostname=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+      --set mock-server.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server \
+      --set mock-server.image.tag=$CI_COMMIT_REF_SLUG \
+      --set mock-server.ingress.enabled=true \
+      --set mock-server.ingress.hosts[0].host=mock-server-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+      --set mock-server.ingress.hosts[0].paths[0].path="/" \
+      --set mock-server.ingress.hosts[0].paths[0].pathType="Prefix" \
       --wait --timeout=10m --create-namespace --atomic
 
 delete_ocf_staging:
@@ -148,50 +189,91 @@ deploy_ocf_oficial_staging:
       echo "### download dependencies###"
       helm dependency build helm/capif
       echo "### updating capif###"
-      helm upgrade --install -n $NAMESPACE_STAGING ocf-staging helm/capif/ --set nginx.nginx.env.capifHostname=capif-staging.$DOMAIN_STAGING \
-      --set nginx.nginx.env.registerHostname=register-staging.$DOMAIN_STAGING \
-      --set monitoring.grafana.ingress.hosts[0].host="grafana-staging.$DOMAIN_STAGING" \
-      --set monitoring.grafana.ingress.hosts[0].paths[0].path="/" \
+      helm upgrade --install -n $NAMESPACE_STAGING ocf-developer helm/capif/ \
+      --set monitoring.grafana.ingress.hosts[0].host=capif-staging.$DOMAIN_STAGING \
+      --set monitoring.grafana.ingress.hosts[0].paths[0].path="/"
       --set monitoring.grafana.ingress.hosts[0].paths[0].pathType="Prefix" \
       --set monitoring.grafana.env.prometheusURL=http://prometheus.ocf.pre-production \
       --set tempo.tempo.metricsGenerator.remoteWriteUrl=http://prometheus.ocf.pre-production/api/v1/write \
-      --set parametersVault.env.vaultHostname=$VAULT_HOSTNAME \
-      --set parametersVault.env.vaultPort=$VAULT_PORT \
-      --set parametersVault.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
-      --set ingress.ip=10.43.107.132 \
-      --set accessControlPolicy.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-access-control-policy-api \
-      --set accessControlPolicy.image.tag=staging \
-      --set apiInvocationLogs.apiInvocationLogs.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-logging-api-invocation-api \
-      --set apiInvocationLogs.apiInvocationLogs.image.tag=staging \
-      --set apiInvokerManagement.apiInvokerManagement.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-api-invoker-management-api \
-      --set apiInvokerManagement.apiInvokerManagement.image.tag=staging \
-      --set apiProviderManagement.apiProviderManagement.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-api-provider-management-api \
-      --set apiProviderManagement.apiProviderManagement.image.tag=staging \
-      --set capifEvents.capifEvents.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-events-api \
-      --set capifEvents.capifEvents.image.tag=staging \
-      --set capifRoutingInfo.capifRoutingInfo.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-routing-info-api \
-      --set capifRoutingInfo.capifRoutingInfo.image.tag=staging \
-      --set capifSecurity.capifSecurity.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-security-api \
-      --set capifSecurity.capifSecurity.image.tag=staging \
-      --set register.register.image.repository=$CI_REGISTRY/ocf/capif/staging/register \
-      --set register.register.image.tag=staging \
-      --set logs.logs.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-auditing-api \
-      --set logs.logs.image.tag=staging \
-      --set nignx.nginx.image.repository=$CI_REGISTRY/ocf/capif/staging/nginx \
-      --set nignx.nginx.image.tag=staging \
-      --set publishedApis.publishedApis.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-publish-service-api \
-      --set publishedApis.publishedApis.image.tag=staging \
-      --set serviceApis.serviceApis.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-discover-service-api \
-      --set serviceApis.serviceApis.image.tag=staging \
-      --set nginx.nginx.image.repository=$CI_REGISTRY/ocf/capif/staging/nginx \
-      --set nginx.nginx.image.tag=staging \
-      --set helper.image.repository=$CI_REGISTRY/ocf/capif/staging/helper \
-      --set helper.image.tag=staging \
-      --set helper.env.vaultHostname=$VAULT_HOSTNAME \
-      --set helper.env.vaultPort=$VAULT_PORT \
-      --set helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
-      --set helper.env.capifHostname=capif-staging.$DOMAIN_STAGING \
-      --wait --timeout=10m --create-namespace
+      --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.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 \
+      --set ocf-api-invocation-logs.env.monitoring="true" \
+      --set ocf-api-invocation-logs.env.capifHostname=capif-staging.$DOMAIN_STAGING \
+      --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_HOSTNAME \
+      --set ocf-api-invocation-logs.env.vaultPort=$VAULT_PORT \
+      --set ocf-api-invocation-logs.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --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.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.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-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" \
+      --set ocf-security.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-security-api \
+      --set ocf-security.image.tag=staging \
+      --set ocf-security.env.monitoring="true" \
+      --set ocf-security.env.capifHostname=capif-staging.$DOMAIN_STAGING \
+      --set ocf-security.env.vaultHostname=$VAULT_HOSTNAME \
+      --set ocf-security.env.vaultPort=$VAULT_PORT \
+      --set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set ocf-register.image.repository=$CI_REGISTRY/ocf/capif/staging/register \
+      --set ocf-register.image.tag=staging \
+      --set ocf-register.env.vaultHostname=$VAULT_HOSTNAME \
+      --set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set ocf-register.env.vaultPort=$VAULT_PORT \
+      --set ocf-register.env.mongoHost=mongo-register \
+      --set ocf-register.env.mongoPort=27017 \
+      --set ocf-register.ingress.enabled=true \
+      --set ocf-register.ingress.hosts[0].host=register-staging.$DOMAIN_STAGING \
+      --set ocf-register.ingress.hosts[0].paths[0].path="/" \
+      --set ocf-register.ingress.hosts[0].paths[0].pathType="Prefix" \
+      --set ocf-auditing-api-logs.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-auditing-api \
+      --set ocf-auditing-api-logs.image.tag=staging \
+      --set ocf-auditing-api-logs.env.monitoring="true" \
+      --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-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" \
+      --set nginx.image.repository=$CI_REGISTRY/ocf/capif/staging/nginx \
+      --set nginx.image.tag=staging \
+      --set nginx.env.capifHostname=capif-staging.$DOMAIN_STAGING \
+      --set nginx.env.vaultHostname=$VAULT_HOSTNAME \
+      --set nginx.env.vaultPort=$VAULT_PORT \
+      --set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set nginx.ingress.enabled=true \
+      --set nginx.ingress.hosts[0].host=capif-staging.$DOMAIN_STAGING \
+      --set nginx.ingress.hosts[0].paths[0].path="/" \
+      --set nginx.ingress.hosts[0].paths[0].pathType="Prefix" \
+      --set ocf-helper.image.repository=$CI_REGISTRY/ocf/capif/staging/helper \
+      --set ocf-helper.image.tag=staging \
+      --set ocf-helper.env.vaultHostname=$VAULT_HOSTNAME \
+      --set ocf-helper.env.vaultPort=$VAULT_PORT \
+      --set ocf-helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set ocf-helper.env.capifHostname=capif-staging.$DOMAIN_STAGING \
+      --set mock-server.image.repository=$CI_REGISTRY/ocf/capif/staging/mock-server \
+      --set mock-server.image.tag=staging \
+      --set mock-server.ingress.enabled=true \
+      --set mock-server.ingress.hosts[0].host=mock-server-staging.$DOMAIN_STAGING \
+      --set mock-server.ingress.hosts[0].paths[0].path="/" \
+      --set mock-server.ingress.hosts[0].paths[0].pathType="Prefix" \
+      --wait --timeout=10m --create-namespace --atomic
 
 ## dev ###
 deploy_ocf_dev:
@@ -227,49 +309,90 @@ deploy_ocf_dev:
       echo "### download dependencies###"
       helm dependency build helm/capif
       echo "### updating capif###"
-      helm upgrade --install -n $NAMESPACE_DEV ocf-developer helm/capif/ --set nginx.nginx.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
-      --set nginx.nginx.env.registerHostname=register-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
-      --set monitoring.grafana.ingress.hosts[0].host="grafana-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV" \
-      --set monitoring.grafana.ingress.hosts[0].paths[0].path="/" \
+      helm upgrade --install -n $NAMESPACE_DEV ocf-developer helm/capif/ \
+      --set monitoring.grafana.ingress.hosts[0].host=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
+      --set monitoring.grafana.ingress.hosts[0].paths[0].path="/"
       --set monitoring.grafana.ingress.hosts[0].paths[0].pathType="Prefix" \
       --set monitoring.grafana.env.prometheusURL=http://prometheus.ocf.pre-production \
       --set tempo.tempo.metricsGenerator.remoteWriteUrl=http://prometheus.ocf.pre-production/api/v1/write \
-      --set parametersVault.env.vaultHostname=$VAULT_HOSTNAME \
-      --set parametersVault.env.vaultPort=$VAULT_PORT \
-      --set parametersVault.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
-      --set ingress.ip=10.43.107.132 \
-      --set accessControlPolicy.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api \
-      --set accessControlPolicy.image.tag=$CI_COMMIT_REF_SLUG \
-      --set apiInvocationLogs.apiInvocationLogs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api \
-      --set apiInvocationLogs.apiInvocationLogs.image.tag=$CI_COMMIT_REF_SLUG \
-      --set apiInvokerManagement.apiInvokerManagement.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api \
-      --set apiInvokerManagement.apiInvokerManagement.image.tag=$CI_COMMIT_REF_SLUG \
-      --set apiProviderManagement.apiProviderManagement.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api \
-      --set apiProviderManagement.apiProviderManagement.image.tag=$CI_COMMIT_REF_SLUG \
-      --set capifEvents.capifEvents.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api \
-      --set capifEvents.capifEvents.image.tag=$CI_COMMIT_REF_SLUG \
-      --set capifRoutingInfo.capifRoutingInfo.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api \
-      --set capifRoutingInfo.capifRoutingInfo.image.tag=$CI_COMMIT_REF_SLUG \
-      --set capifSecurity.capifSecurity.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api \
-      --set capifSecurity.capifSecurity.image.tag=$CI_COMMIT_REF_SLUG \
-      --set register.register.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register \
-      --set register.register.image.tag=$CI_COMMIT_REF_SLUG \
-      --set logs.logs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api \
-      --set logs.logs.image.tag=$CI_COMMIT_REF_SLUG \
-      --set nignx.nginx.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx \
-      --set nignx.nginx.image.tag=$CI_COMMIT_REF_SLUG \
-      --set publishedApis.publishedApis.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api \
-      --set publishedApis.publishedApis.image.tag=$CI_COMMIT_REF_SLUG \
-      --set serviceApis.serviceApis.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api \
-      --set serviceApis.serviceApis.image.tag=$CI_COMMIT_REF_SLUG \
-      --set nginx.nginx.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx \
-      --set nginx.nginx.image.tag=$CI_COMMIT_REF_SLUG \
-      --set helper.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper \
-      --set helper.image.tag=$CI_COMMIT_REF_SLUG \
-      --set helper.env.vaultHostname=$VAULT_HOSTNAME \
-      --set helper.env.vaultPort=$VAULT_PORT \
-      --set helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
-      --set helper.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
+      --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_ENVIRONMENT_SLUG.$DOMAIN_DEV \
+      --set ocf-access-control-policy.monitoring="true" \
+      --set ocf-api-invocation-logs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api \
+      --set ocf-api-invocation-logs.image.tag=$CI_COMMIT_REF_SLUG \
+      --set ocf-api-invocation-logs.env.monitoring="true" \
+      --set ocf-api-invocation-logs.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
+      --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_HOSTNAME \
+      --set ocf-api-invocation-logs.env.vaultPort=$VAULT_PORT \
+      --set ocf-api-invocation-logs.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --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.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/$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.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/$CI_COMMIT_REF_SLUG/ocf-events-api \
+      --set ocf-events.image.tag=$CI_COMMIT_REF_SLUG \
+      --set ocf-events.env.monitoring="true" \
+      --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 \
+      --set ocf-routing-info.env.monitoring="true" \
+      --set ocf-security.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api \
+      --set ocf-security.image.tag=$CI_COMMIT_REF_SLUG \
+      --set ocf-security.env.monitoring="true" \
+      --set ocf-security.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
+      --set ocf-security.env.vaultHostname=$VAULT_HOSTNAME \
+      --set ocf-security.env.vaultPort=$VAULT_PORT \
+      --set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set ocf-register.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register \
+      --set ocf-register.image.tag=$CI_COMMIT_REF_SLUG \
+      --set ocf-register.env.vaultHostname=$VAULT_HOSTNAME \
+      --set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set ocf-register.env.vaultPort=$VAULT_PORT \
+      --set ocf-register.env.mongoHost=mongo-register \
+      --set ocf-register.env.mongoPort=27017 \
+      --set ocf-register.ingress.enabled=true \
+      --set ocf-register.ingress.hosts[0].host=register-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
+      --set ocf-register.ingress.hosts[0].paths[0].path="/" \
+      --set ocf-register.ingress.hosts[0].paths[0].pathType="Prefix" \
+      --set ocf-auditing-api-logs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api \
+      --set ocf-auditing-api-logs.image.tag=$CI_COMMIT_REF_SLUG \
+      --set ocf-auditing-api-logs.env.monitoring="true" \
+      --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-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 \
+      --set ocf-discover-service-api.env.monitoring="true" \
+      --set nginx.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx \
+      --set nginx.image.tag=$CI_COMMIT_REF_SLUG \
+      --set nginx.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
+      --set nginx.env.vaultHostname=$VAULT_HOSTNAME \
+      --set nginx.env.vaultPort=$VAULT_PORT \
+      --set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set nginx.ingress.enabled=true \
+      --set nginx.ingress.hosts[0].host=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
+      --set nginx.ingress.hosts[0].paths[0].path="/" \
+      --set nginx.ingress.hosts[0].paths[0].pathType="Prefix" \
+      --set ocf-helper.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper \
+      --set ocf-helper.image.tag=$CI_COMMIT_REF_SLUG \
+      --set ocf-helper.env.vaultHostname=$VAULT_HOSTNAME \
+      --set ocf-helper.env.vaultPort=$VAULT_PORT \
+      --set ocf-helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set ocf-helper.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
+      --set mock-server.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/mock-server \
+      --set mock-server.image.tag=$CI_COMMIT_REF_SLUG \
+      --set mock-server.ingress.enabled=true \
+      --set mock-server.ingress.hosts[0].host=mock-server-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
+      --set mock-server.ingress.hosts[0].paths[0].path="/" \
+      --set mock-server.ingress.hosts[0].paths[0].pathType="Prefix" \
       --wait --timeout=10m --create-namespace --atomic
 
 delete_ocf_dev: