diff --git a/.gitlab/build.sh b/.gitlab/build.sh
index 370b00f1e86c64478defcbc2309b3b20cc2be9c9..0d17fd1444511508505ac74072203612484ff18f 100755
--- a/.gitlab/build.sh
+++ b/.gitlab/build.sh
@@ -64,10 +64,16 @@ eval '${SCAN}cmake --build build-${VERSION} -j 4 > /dev/null'
 # Install
 cmake --install build-${VERSION}
 
+
 #
 # Check link to chameleon
 #
-cd .gitlab/check_link/
+
+# Set the path variables
+if [[ "$SYSTEM" == "windows" ]]; then
+  export PATH="/c/Windows/WinSxS/x86_microsoft-windows-m..namespace-downlevel_31bf3856ad364e35_10.0.19041.1_none_21374cb0681a6320":$PATH
+fi
+source install-${VERSION}/bin/chameleon_env
 
 # Set the compiler
 if [[ "$SYSTEM" == "macosx" ]]; then
@@ -78,21 +84,7 @@ else
 fi
 export FC=gfortran
 
-# Set the path variables
-if [[ "$SYSTEM" == "guix" ]]; then
-  export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH
-  export LD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LD_LIBRARY_PATH
-elif [[ "$SYSTEM" == "linux" ]]; then
-  export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH
-  export LD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LD_LIBRARY_PATH
-elif [[ "$SYSTEM" == "macosx" ]]; then
-  export LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LIBRARY_PATH
-  export DYLD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$DYLD_LIBRARY_PATH
-elif [[ "$SYSTEM" == "windows" ]]; then
-  export PATH="/c/Windows/WinSxS/x86_microsoft-windows-m..namespace-downlevel_31bf3856ad364e35_10.0.19041.1_none_21374cb0681a6320":$PATH
-  export PATH=$PWD/../../install-${VERSION}/bin:$PATH
-fi
-
+cd .gitlab/check_link/
 # 1) using cmake:
 ./link_cmake.sh $PWD/../../install-${VERSION}
 # 2) using pkg-config:
diff --git a/.gitlab/sonarqube.yml b/.gitlab/sonarqube.yml
index e9d4d1ab108d5a261ad3645012cb904d9798a9b6..dcc43e95e844d207096bc9e6b49e32f8c764f77d 100644
--- a/.gitlab/sonarqube.yml
+++ b/.gitlab/sonarqube.yml
@@ -2,6 +2,9 @@
 .sonarqube:
   stage: analyze
   variables:
+    GIT_CONFIG_COUNT: 1
+    GIT_CONFIG_KEY_0: "safe.directory"
+    GIT_CONFIG_VALUE_0: "*"
     GIT_DEPTH: "0"
     VERSION: sonarqube
   script:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15f757a9e8721c2f39ab2bb62fdcf6b6347f5ccb..72ca22c9582aa86e321b86af2b7d0e477b5b52de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -821,6 +821,8 @@ include(ChameleonPkgConfig)
 # Create .pc file
 # ---------------
 chameleon_generate_pkgconfig_files()
+
+generate_newenv_file(PACKAGE chameleon)
 #------------------------------------------------------------------------------
 
 ###############################################################################