diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 554a05552b4cd9ace0e56366d98dfe8e78b758b4..26e6e14c08679c4c5a6361501cdf886c23a612e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,15 @@
 #---------------------------------------------------------------------------------------
 # Global
 #---------------------------------------------------------------------------------------
-image: "registry.gitlab.com/garz-fricke/yocto/infrastructure/ci-images/python/3.8:\
-          82661251e22d9651a3e5b17e56f41a2266339f29"
+variables:
+    CI_IMAGES_BASEPATH: registry.gitlab.com/garz-fricke/yocto/infrastructure
+    CI_IMAGES_PATH: ${CI_IMAGES_BASEPATH}/ci-images
+    CI_IMAGES_REVISION: 1fc5f61d3d8338f900a19e34a448a577e513a90c
+    CI_IMAGE_PYTHON: "${CI_IMAGES_PATH}/python/3.8:${CI_IMAGES_REVISION}"
+    CI_IMAGE_YOCTO: "${CI_IMAGES_PATH}/yocto-build/ubuntu-20.04:${CI_IMAGES_REVISION}"
+
+image: "${CI_IMAGE_PYTHON}"
+          
 
 default:
   tags:
@@ -26,6 +33,10 @@ pylint:
   script:
     - pylint --rcfile=pylintrc *.py
 
+pylint-yocto:
+  extends: pylint
+  image: "${CI_IMAGE_YOCTO}"  
+
 black:
   stage: analyze
   timeout: 2m