diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a838014572ca9689b62b75f3d77368071d453296..9167f154f92e62ea9542ac85aa672d1007ecceb1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,7 +110,7 @@ ubuntu-xdk-prepare:
   extends: .common-prepare
   image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-superbuild-base:18.04
   script:
-    - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base
+    - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=ubuntu-18.04-llvm
 
 ubuntu-xdk-build-doc:
   extends: .common-build
@@ -120,7 +120,7 @@ ubuntu-xdk-build-doc:
     - mv build/CookBook-*-html.tar.gz . || true
     - mv build/Documentation/Cookbook/latex/CookBook-*.pdf . || true
     - mv build/Documentation/Doxygen/OTB-Doxygen-*.tar.bz2 . || true
-    - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-ubuntu-superbuild-base -DNAME_SUFFIX:string=-glibc-2.27
+    - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=ubuntu-18.04-llvm-xdk -DNAME_SUFFIX:string=-glibc-2.27
     - mv build_packages/OTB-*.run . || true
   dependencies:
     - ubuntu-xdk-prepare
@@ -130,14 +130,14 @@ centos-xdk-prepare:
   extends: .common-prepare
   image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
   script:
-    - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
+    - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=centos-6.6-gcc
 
 centos-xdk-build:
   extends: .common-build
   image: $BUILD_IMAGE_REGISTRY/otb-centos-superbuild-base:6.6
   script:
-    - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
-    - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-centos-superbuild-base
+    - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=centos-6.6-gcc
+    - xvfb-run -a -n 1 -s "-screen 0 1024x768x24 -dpi 96" ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=centos-6.6-gcc
     - mv build_packages/OTB-*.run . || true
   dependencies:
     - centos-xdk-prepare
@@ -148,15 +148,15 @@ macos-xdk-prepare:
   tags:
     - macos
   script:
-    - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild
+    - ctest -VV -S CI/prepare_superbuild.cmake -DIMAGE_NAME:string=macos-10.11.6-clang
 
 macos-xdk-build:
   tags:
     - macos
   extends: .common-build
   script:
-    - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=otb-macos-superbuild
-    - ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=otb-macos-superbuild
+    - ctest -V -S CI/main_superbuild.cmake -DIMAGE_NAME:string=macos-10.11.6-clang
+    - ctest -V -S CI/main_packages.cmake -DIMAGE_NAME:string=macos-10.11.6-clang
     - mv build_packages/OTB-*.run . || true
   dependencies:
     - macos-xdk-prepare
diff --git a/CI/otb-macos-superbuild.cmake b/CI/macos-10.11.6-clang.cmake
similarity index 100%
rename from CI/otb-macos-superbuild.cmake
rename to CI/macos-10.11.6-clang.cmake
diff --git a/CI/macros.cmake b/CI/macros.cmake
index 833aa106240bcc6b3c51313db4131612a1608d76..036772ca2b32f2d2db83848e3c938b8e7627c207 100644
--- a/CI/macros.cmake
+++ b/CI/macros.cmake
@@ -64,7 +64,7 @@ macro(get_xdk)
 
   # Download xdk :
   #   git clone $REPOSITORY_URL --branch $BRANCH_NAME --depth 1 superbuild-artifact
-  set ( REMOTE "https://gitlab.orfeo-toolbox.org/gbonnefille/superbuild-artifact.git")
+  set ( REMOTE "https://gitlab.orfeo-toolbox.org/orfeotoolbox/superbuild-artifact.git")
   execute_process(
     COMMAND ${CTEST_GIT_COMMAND} "clone" "${REMOTE}" "--branch" "${BRANCH_NAME}"
     "--depth" "1" "superbuild-artifact"
diff --git a/CI/prepare_superbuild.cmake b/CI/prepare_superbuild.cmake
index ec99220d64881c82e27b846fcb4cf3a297ba0329..1801b6ddff640f754d65dfb330993e0f8674fb15 100644
--- a/CI/prepare_superbuild.cmake
+++ b/CI/prepare_superbuild.cmake
@@ -137,7 +137,7 @@ file (REMOVE ${SB_TXT})
 ####################################
 file ( WRITE "${OTB_SOURCE_DIR}/sb_branch.txt" "${IMAGE_NAME}/${SB_MD5}")
 message( "Checking out git for existence of archive")
-set ( REMOTE "https://gitlab.orfeo-toolbox.org/gbonnefille/superbuild-artifact/")
+set ( REMOTE "https://gitlab.orfeo-toolbox.org/orfeotoolbox/superbuild-artifact/")
 set ( BRANCH_NAME "${IMAGE_NAME}/${SB_MD5}")
 
 execute_process(
@@ -188,7 +188,7 @@ else()
   
   # REPOSITORY_GIT_URL and REMOTE whould be the same. Right now there are
   # different because one is https and one is ssh. Both should be ssh.
-  set( REPOSITORY_GIT_URL "git@gitlab.orfeo-toolbox.org:gbonnefille/superbuild-artifact.git")
+  set( REPOSITORY_GIT_URL "git@gitlab.orfeo-toolbox.org:orfeotoolbox/superbuild-artifact.git")
   # We clone master to have a basic configuration, mainly a correct .gitattribute
   # git clone $REMOTE --branch master --depth 1 superbuild-artifact
   execute_process(