diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90456b9b6816d7f03d6bc015d9fcf4b8a8d997c2..6c0dbf1433fb42846aa8a8e0e3a5250272748210 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,13 @@
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Global
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
+
 variables:
-    CI_IMAGES_BASEPATH: registry.gitlab.com/garz-fricke/yocto/infrastructure
-    CI_IMAGES_PATH: ${CI_IMAGES_BASEPATH}/ci-images
-    CI_IMAGES_REVISION: 99e363bc5feaa27ff18dbe7731a76ff04d7d0deb
-    CI_IMAGE_PYTHON: "${CI_IMAGES_PATH}/python/3.9:${CI_IMAGES_REVISION}"
-    CI_IMAGE_YOCTO: "${CI_IMAGES_PATH}/yocto-build/ubuntu-20.04:${CI_IMAGES_REVISION}"
+  # CI_IMAGES_BASEPATH: Environment variable configure in gitlab
+  CI_IMAGES_PATH: ${CI_IMAGES_BASEPATH}/ci-images
+  CI_IMAGES_REVISION: 99e363bc5feaa27ff18dbe7731a76ff04d7d0deb
+  CI_IMAGE_PYTHON: "${CI_IMAGES_PATH}/python/3.9:${CI_IMAGES_REVISION}"
+  CI_IMAGE_YOCTO: "${CI_IMAGES_PATH}/yocto-build/ubuntu-20.04:${CI_IMAGES_REVISION}"
 
 image: "${CI_IMAGE_PYTHON}"
 
@@ -23,9 +24,9 @@ workflow:
     - if: $CI_MERGE_REQUEST_IID
     - if: $CI_COMMIT_BRANCH == "master"
 
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Stage: analyze
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 pylint:
   stage: analyze
   timeout: 2m
@@ -34,7 +35,7 @@ pylint:
 
 pylint-yocto:
   extends: pylint
-  image: "${CI_IMAGE_YOCTO}"  
+  image: "${CI_IMAGE_YOCTO}"
 
 black:
   stage: analyze
@@ -48,9 +49,9 @@ executable:
   script:
     - (! find ! -executable -name "*.py" -exec echo "not executable:"" {}" \; | grep .)
 
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 # Stage: deploy
-#---------------------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------
 .deploy: &deploy
   stage: deploy
   when: manual
@@ -66,9 +67,9 @@ executable:
       --revision=${CI_COMMIT_SHA}
       ${MERGE}
 
-garz-fricke/yocto/infrastructure/ci-test/minimal-bar: *deploy
-garz-fricke/yocto/infrastructure/ci-test/minimal-foo: *deploy
-garz-fricke/yocto/infrastructure/ci-test/minimal-manifest: *deploy
-garz-fricke/yocto/layers/meta-guf-distro: *deploy
-garz-fricke/yocto/layers/meta-guf-machine: *deploy
-garz-fricke/yocto/manifest: *deploy
+${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/ci-test/minimal-bar: *deploy
+${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/ci-test/minimal-foo: *deploy
+${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/ci-test/minimal-manifest: *deploy
+${CI_PROJECT_ROOT_NAMESPACE}/yocto/layers/meta-guf-distro: *deploy
+${CI_PROJECT_ROOT_NAMESPACE}/yocto/layers/meta-guf-machine: *deploy
+${CI_PROJECT_ROOT_NAMESPACE}/yocto/manifest: *deploy