diff --git a/capif/.gitlab-ci.yml b/capif/.gitlab-ci.yml
index 4405b8e480d09af6a0e2ddee290420143e33da08..d29cdd62bca818d4061928e09ee1228bfca030c4 100644
--- a/capif/.gitlab-ci.yml
+++ b/capif/.gitlab-ci.yml
@@ -612,7 +612,7 @@ deploy_ocf_main:
       --set ocf-api-invocation-logs.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \
       --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-invocation-logs.env.vaultAccessToken=$VAULT_HOSTNAME_PROD \
       --set ocf-api-invocation-logs.env.logLevel="INFO" \
       --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 \
@@ -620,7 +620,7 @@ deploy_ocf_main:
       --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 \
+      --set ocf-api-invoker-management.env.vaultAccessToken=$VAULT_HOSTNAME_PROD \
       --set ocf-api-invoker-management.env.logLevel="INFO" \
       --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 \
@@ -628,7 +628,7 @@ deploy_ocf_main:
       --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 \
+      --set ocf-api-provider-management.env.vaultAccessToken=$VAULT_HOSTNAME_PROD \
       --set ocf-api-provider-management.env.logLevel="INFO" \
       --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 \
@@ -645,12 +645,12 @@ deploy_ocf_main:
       --set ocf-security.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \
       --set ocf-security.env.vaultHostname=$VAULT_HOSTNAME \
       --set ocf-security.env.vaultPort=$VAULT_PORT \
-      --set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set ocf-security.env.vaultAccessToken=$VAULT_HOSTNAME_PROD \
       --set ocf-security.env.logLevel="INFO" \
       --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.vaultAccessToken=$VAULT_HOSTNAME_PROD \
       --set ocf-register.env.vaultPort=$VAULT_PORT \
       --set ocf-register.env.mongoHost=mongo-register \
       --set ocf-register.env.mongoPort=27017 \
@@ -678,7 +678,7 @@ deploy_ocf_main:
       --set nginx.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \
       --set nginx.env.vaultHostname=$VAULT_HOSTNAME \
       --set nginx.env.vaultPort=$VAULT_PORT \
-      --set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+      --set nginx.env.vaultAccessToken=$VAULT_HOSTNAME_PROD \
       --set nginx.ingress.enabled=true \
       --set nginx.ingress.hosts[0].host=capif-main.$DOMAIN_PRE_PROD \
       --set nginx.ingress.hosts[0].paths[0].path="/" \
@@ -688,7 +688,7 @@ deploy_ocf_main:
       --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.vaultAccessToken=$VAULT_HOSTNAME_PROD \
       --set ocf-helper.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \
       --set ocf-helper.env.logLevel="INFO" \
       --set mock-server.enabled=true \