diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ccf249236467bf8275bd52b78ae809af6d760fd..17a1e5258f2727046350fa5a5ff87453792db952 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 variables:
   DOCKER_DRIVER: overlay2
+  GIT_DEPTH: "3"
 
 stages:
   - build
@@ -17,13 +18,13 @@ stages:
 native-build:
   extends: .general
   stage: build
-  image: registry.orfeo-toolbox.org/orfeotoolbox/otb:ubuntu-18.04-gcc
+  image: registry.orfeo-toolbox.org/gbonnefille/otb-build-env/otb-ubuntu-native:18.04
   script:
     - ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc
 
 shark-build:
   extends: .general
   stage: build
-  image: registry.orfeo-toolbox.org/orfeotoolbox/otb:ubuntu-18.04-gcc-shark-3.1.4
+  image: registry.orfeo-toolbox.org/gbonnefille/otb-build-env/otb-ubuntu-shark:18.04
   script:
-    - ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc-shark-3.1.4
\ No newline at end of file
+    - ctest -VV -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-18.04-gcc-shark-3.1.4
diff --git a/CI/configure_option.cmake b/CI/configure_option.cmake
index 183759a1c13b6fa42ef75c82aaeb17f812f0c2db..1b431e5caef18d59d7bae714020efd3372c12024 100644
--- a/CI/configure_option.cmake
+++ b/CI/configure_option.cmake
@@ -48,7 +48,7 @@ OTB_USE_OPENGL:BOOL=ON
 OTB_USE_OPENMP:BOOL=ON
 OTB_USE_QT:BOOL=ON
 OTB_USE_QWT:BOOL=ON
-OTB_USE_SHARK:BOOL=$ENV{OTB_USESHARK}
+OTB_USE_SHARK:BOOL=ON
 OTB_USE_SIFTFAST:BOOL=ON
 OTB_USE_SPTW:BOOL=ON
 OTB_USE_SSE_FLAGS:BOOL=ON")
diff --git a/CI/ubuntu-18.04-gcc.cmake b/CI/ubuntu-18.04-gcc.cmake
index 80e079b53c9e105c433f5293589ee8849305bafe..0b2efec855dbbcf33151753ffd22b8b8cb21fc37 100644
--- a/CI/ubuntu-18.04-gcc.cmake
+++ b/CI/ubuntu-18.04-gcc.cmake
@@ -21,4 +21,5 @@
 # Configuration options for ubuntu-18.04-gcc
 
 set(site_option
-"opencv_INCLUDE_DIR:PATH=/usr/include")
+"opencv_INCLUDE_DIR:PATH=/usr/include
+OTB_USE_SHARK:BOOL=OFF")