diff --git a/capif/.gitlab-ci.yml b/capif/.gitlab-ci.yml
index c521998a7126c12ef0e05eaa74f767912f91c846..7c6935a31059b91b3836959db34f09d01597b5ba 100644
--- a/capif/.gitlab-ci.yml
+++ b/capif/.gitlab-ci.yml
@@ -30,13 +30,13 @@ stages:
 
 variables:
   GITLAB_API: "https://labs.etsi.org/api/v4"
-  CI_JOB_TOKEN: $CI_JOB_TOKEN
+#  CI_JOB_TOKEN: $CI_JOB_TOKEN
   CI_DEBUG_TRACE: "true"
   PROJECT_ID: "294"
   SAST_EXCLUDED_ANALYZERS: "nodejs-scan"
-  CI_REGISTRY_USER: $CI_REGISTRY_USER
-  CI_REGISTRY: $CI_REGISTRY
-  CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY
+#  CI_REGISTRY_USER: $CI_REGISTRY_USER
+#  CI_REGISTRY: $CI_REGISTRY
+#  CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY
 
 
 .main_common: &main_common
@@ -230,7 +230,7 @@ main_build_and_push:
    - export TMP_PWD=$PWD
    - echo "TMP_PWD=$TMP_PWD"
    - echo "### docker login###"
-   - docker login --username $CI_REGISTRY_USER --password $CAPIF_DOCKER_REGISTRY $CI_REGISTRY
+   - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
    - echo "----------------------------------------------------"
    - echo "### build and push nginx image###"
    - cd $TMP_PWD/services/nginx/
diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
index d41a76010f8d793b7a674418b6a2ce3e508f0d1b..b7151189555292c5438f566568c1794262c18526 100644
--- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml
+++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
@@ -11,13 +11,13 @@ variables:
   DOMAIN_STAGING: ocf.validation
   DOMAIN_DEV: ocf.develop
   DOMAIN_PROD: prod.int
-  CI_JOB_TOKEN: $CI_JOB_TOKEN
+#  CI_JOB_TOKEN: $CI_JOB_TOKEN
   IMAGE_TAG_DEV: $CI_COMMIT_REF_SLUG
   IMAGE_TAG_STAGING: $CI_COMMIT_REF_SLUG
   VAULT_HOSTNAME: $VAULT_HOSTNAME
   VAULT_PORT: $VAULT_PORT
   VAULT_ACCESS_TOKEN: $VAULT_ACCESS_TOKEN
-  CI_REGISTRY: $CI_REGISTRY
+#  CI_REGISTRY: $CI_REGISTRY
 
 .staging_common: &staging_common
   only:
diff --git a/capif/templates/ci_dev.gitlab-ci.yml b/capif/templates/ci_dev.gitlab-ci.yml
index 3f6825a426ec79882c273a8dd6ff40056c75cdbc..40b392ca14b92bff6ed4b812302565073af7b73d 100644
--- a/capif/templates/ci_dev.gitlab-ci.yml
+++ b/capif/templates/ci_dev.gitlab-ci.yml
@@ -128,7 +128,6 @@ dev_build_and_push:
    - export TMP_PWD=$PWD
    - echo "TMP_PWD=$TMP_PWD"
    - echo "### docker login###"
-#   - docker login --username $CI_REGISTRY_USER --password $CAPIF_DOCKER_REGISTRY $CI_REGISTRY
    - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
    - echo "----------------------------------------------------"
    - echo "### build and push nginx image###"
diff --git a/capif/templates/ci_staging.gitlab-ci.yml b/capif/templates/ci_staging.gitlab-ci.yml
index b34f0b0d2f0b0de70f98876884b7a746b3ca43c2..0c39c89a5d44377c518d4ee062a84da44650febd 100644
--- a/capif/templates/ci_staging.gitlab-ci.yml
+++ b/capif/templates/ci_staging.gitlab-ci.yml
@@ -10,11 +10,11 @@ stages:
   - staging_build_and_push_mr
 
 variables:
-  CI_JOB_TOKEN: $CI_JOB_TOKEN
+#  CI_JOB_TOKEN: $CI_JOB_TOKEN
   CI_DEBUG_TRACE: "false"
-  CI_REGISTRY_USER: $CI_REGISTRY_USER
-  CI_REGISTRY: $CI_REGISTRY
-  CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY
+#  CI_REGISTRY_USER: $CI_REGISTRY_USER
+#  CI_REGISTRY: $CI_REGISTRY
+#  CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY
 
 .staging_common: &staging_common
   only:
diff --git a/capif/templates/ci_unit_test.gitlab-ci.yml b/capif/templates/ci_unit_test.gitlab-ci.yml
index 32f606f5df2d5adc1a85fff084c0f144076915eb..74288a5eef2fa12d652762697411a9579733cd4d 100644
--- a/capif/templates/ci_unit_test.gitlab-ci.yml
+++ b/capif/templates/ci_unit_test.gitlab-ci.yml
@@ -2,11 +2,11 @@ stages:
   - staging_unit_tests
 
 variables:
-  CI_JOB_TOKEN: $CI_JOB_TOKEN
+#  CI_JOB_TOKEN: $CI_JOB_TOKEN
   CI_DEBUG_TRACE: "false"
-  CI_REGISTRY_USER: $CI_REGISTRY_USER
-  CI_REGISTRY: $CI_REGISTRY
-  CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY
+#  CI_REGISTRY_USER: $CI_REGISTRY_USER
+#  CI_REGISTRY: $CI_REGISTRY
+#  CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY
 
 .staging_common: &staging_common
   only:
diff --git a/capif/templates/cicd-deploy-release.gitlab-ci.yml b/capif/templates/cicd-deploy-release.gitlab-ci.yml
index 5b985087825b66a313d7b4133e32647a0e3d7bb3..9408eb800d6477698c0b7833eca53cfa1271a130 100644
--- a/capif/templates/cicd-deploy-release.gitlab-ci.yml
+++ b/capif/templates/cicd-deploy-release.gitlab-ci.yml
@@ -3,10 +3,10 @@ stages:
   - deploy_ocf_prod
 
 variables:
-  CI_JOB_TOKEN: $CI_JOB_TOKEN
+#  CI_JOB_TOKEN: $CI_JOB_TOKEN
   CI_DEBUG_TRACE: "false"
-  CI_REGISTRY_USER: $CI_REGISTRY_USER
-  CI_REGISTRY: $CI_REGISTRY
+#  CI_REGISTRY_USER: $CI_REGISTRY_USER
+#  CI_REGISTRY: $CI_REGISTRY
   CAPIF_DOCKER_REGISTRY: $CAPIF_DOCKER_REGISTRY
   NAMESPACE_PROD: "ocf-prod"
   DOMAIN_PROD: prod.int
@@ -33,7 +33,7 @@ prod_build_and_push:
    - export TMP_PWD=$PWD
    - echo "TMP_PWD=$TMP_PWD"
    - echo "### docker login###"
-   - docker login --username $CI_REGISTRY_USER --password $CAPIF_DOCKER_REGISTRY $CI_REGISTRY
+   - echo "$CI_JOB_TOKEN" | docker login $CI_REGISTRY --username $CI_REGISTRY_USER --password-stdin
    - echo "----------------------------------------------------"
    - echo "### build and push nginx image###"
    - cd $TMP_PWD/services/nginx/