diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b99b32d70a5ba225c534db5d978d93e03162f57..b8d55ca91aaf5eb75957f1dccf45c8861bd5d7c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,13 +60,13 @@ package-el6-x86_64:
     - test-el6-x86_64
 
 linux-el6-i686:
-  extends: [".build-python"]
+  extends: [".build"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
   variables:
     NAME: "git-${GIT_VERSION}-linux-el6-i686"
 
 test-el6-i686:
-  extends: [".test-python"]
+  extends: [".test"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
   variables:
     NAME: "git-${GIT_VERSION}-linux-el6-i686"
@@ -83,13 +83,13 @@ package-el6-i686:
     - test-el6-i686
 
 linux-el7-x86_64:
-  extends: [".build-python"]
+  extends: [".build"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
   variables:
     NAME: "git-${GIT_VERSION}-linux-el7-x86_64"
 
 test-el7-x86_64:
-  extends: [".test-python"]
+  extends: [".test"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
   variables:
     NAME: "git-${GIT_VERSION}-linux-el7-x86_64"
@@ -106,14 +106,14 @@ package-el7-x86_64:
     - test-el7-x86_64
 
 linux-el7-i686:
-  extends: [".build-python"]
+  extends: [".build"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
   variables:
     NAME: "git-${GIT_VERSION}-${CI_JOB_NAME}"
     GIT_ROOT: "${CI_PROJECT_DIR}/${NAME}"
 
 test-el7-i686:
-  extends: [".test-python"]
+  extends: [".test"]
   image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
   needs:
     - linux-el7-i686