diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2dc870ddad2accd523405be2b3092d20383a5b6e..9313c184e71cb8bf3131baeb1db6cedfb24f7cd2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,12 +50,17 @@ stages:
 
 .env: &env
   - echo "Pipeline triggered by $TRIGGERED_BY_REPO@$TRIGGERED_BY_REF ($TRIGGERED_BY_HASH)"
-  - echo "CPPLIB_REGISTRY_IMAGE = $CPPLIB_REGISTRY_IMAGE"
   - echo "CI_REGISTRY_IMAGE_BASE = $CI_REGISTRY_IMAGE_BASE"
   - echo "CPPINTTEST_REGISTRY_IMAGE = $CPPINTTEST_REGISTRY_IMAGE"
   - echo "CPPINTTEST_IMAGE_CACHE = $CPPINTTEST_IMAGE_CACHE"
   - echo "CAOSDB_TAG = $CAOSDB_TAG"
   - echo "F_BRANCH = $F_BRANCH"
+  - echo "CPPLIB = $CPPLIB"
+  - if [ -n "$CPPLIB" ] ; then
+      echo "CPPLIB_REGISTRY_IMAGE = $CPPLIB_REGISTRY_IMAGE" ;
+      CPPLIB_REGISTRY_IMAGE="$CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:$CPPLIB" ;
+    fi
+  - echo "CPPLIB_REGISTRY_IMAGE = $CPPLIB_REGISTRY_IMAGE"
 
 info:
   tags: [cached-dind]