diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
index bb826868d7494c16e1c702394b41a29305e2b113..d1cf45dea2e5e6def912879b9cf95530823cc763 100644
--- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml
+++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
@@ -73,10 +73,8 @@ deploy_ocf_staging:
       --set parametersVault.env.vaultPort=$VAULT_PORT \
       --set parametersVault.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
       --set ingress.ip=10.43.107.132 \
-      --set access-control-policy.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api \
-      --set access-control-policy.image.tag=$CI_COMMIT_REF_SLUG \
-      --set access-control-policy.image.env.capifHostname=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
-      --set access-control-policy.env.monitoring="true" \
+      --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 \
@@ -161,10 +159,8 @@ deploy_ocf_oficial_staging:
       --set parametersVault.env.vaultPort=$VAULT_PORT \
       --set parametersVault.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
       --set ingress.ip=10.43.107.132 \
-      --set access-control-policy.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-access-control-policy-api \
-      --set access-control-policy.image.tag=staging \
-      --set access-control-policy.image.env.capifHostname=capif-staging.$DOMAIN_STAGING \
-      --set access-control-policy.env.monitoring="true" \
+      --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 \
@@ -242,10 +238,8 @@ deploy_ocf_dev:
       --set parametersVault.env.vaultPort=$VAULT_PORT \
       --set parametersVault.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
       --set ingress.ip=10.43.107.132 \
-      --set access-control-policy.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api \
-      --set access-control-policy.image.tag=$CI_COMMIT_REF_SLUG \
-      --set access-control-policy.image.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
-      --set access-control-policy.env.monitoring="true" \
+      --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 \