diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
index 1cf0f9e9f9911c9290914a5aa8a92835a1321f2c..c4799ec2ff1d0e8fff0768b429403f6c709c9fcd 100644
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
@@ -81,3 +81,8 @@ RUN cd starpu-1.4.7/ && \
     rm starpu-1.4.7.tar.gz
 
 USER gitlab
+
+# Set some default environment variables
+ENV LIBRARY_PATH=/usr/local/lib
+ENV LD_LIBRARY_PATH=/usr/local/lib
+ENV PKG_CONFIG_PATH=/home/gitlab/install/starpu/lib/pkgconfig
diff --git a/.gitlab/Dockerfile-pages b/.gitlab/Dockerfile-pages
index df216af38343314c6186b79e7f0e18b0d0d658b1..441685f584274e724e21468fced26638beb8d239 100644
--- a/.gitlab/Dockerfile-pages
+++ b/.gitlab/Dockerfile-pages
@@ -33,3 +33,8 @@ RUN apt-get autoclean -y
 RUN apt-get purge -y
 
 USER gitlab
+
+# Set some default environment variables
+ENV LIBRARY_PATH=/usr/local/lib
+ENV LD_LIBRARY_PATH=/usr/local/lib
+ENV PKG_CONFIG_PATH=/home/gitlab/install/starpu/lib/pkgconfig
diff --git a/.gitlab/build.sh b/.gitlab/build.sh
index bdfe6baec928a6d54f6a29c25ef8ab4fd42d60d7..370b00f1e86c64478defcbc2309b3b20cc2be9c9 100755
--- a/.gitlab/build.sh
+++ b/.gitlab/build.sh
@@ -83,8 +83,8 @@ 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:/usr/local/lib
-  export LD_LIBRARY_PATH=$PWD/../../install-${VERSION}/lib:$LD_LIBRARY_PATH:/usr/local/lib
+  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
diff --git a/tools/pages.sh b/tools/pages.sh
index 7d03463d31fe9c56c3f1475dbd0b6de56594c6be..98f170243fc5472b637cd913bd59feff9f7b9a97 100755
--- a/tools/pages.sh
+++ b/tools/pages.sh
@@ -13,12 +13,6 @@ set -e
 set -x
 CHAMELEON_SRC_DIR=${CHAMELEON_SRC_DIR:-$PWD}
 
-# where is installed starpu in the docker image
-CURRENTUSER=`whoami`
-if [[ -f /.dockerenv && $CURRENTUSER == "gitlab" ]]; then
-  export PKG_CONFIG_PATH=/home/gitlab/install/starpu/lib/pkgconfig:$PKG_CONFIG_PATH
-fi
-
 mkdir -p tmp_fig
 cd tmp_fig