diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3508233c4987bf33afc794c730f02f991277bf51..e9e08314ef631367d7645a5e77174094f63d3bf1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,62 +1,28 @@
 # CI Config for ltaftpy / gitlab
-stages:
-  - build
-#  - test
-  - doc
 
-# Global runner/docker image definition
-image: ubuntu:latest
-
-# Global caching 
-cache:
-  key: "cache"
-  paths:
-# apt
-    - apt-cache
-# build
-    - build
-  
-before_script:
-  - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-  - apt-get update -yq && apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake libfftw3-dev liblapack-dev
-  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y python3.5 python3.5-dev python3-pip python3-tk
-  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y python3-matplotlib
-  - pip3 install --upgrade pip
-  - pip3 install scipy nose coverage pytest pytest-cov Sphinx sphinxcontrib-bibtex
-  - pip3 list
-
-# Main build 
-build: 
-  stage: build
+#On X86_64 ubuntu
+unbutu:X86_64:
+  image: registry.gitlab.lif.univ-mrs.fr:5005/dev/ltfatpy/ubuntu:X86_64
   tags:
     - docker
   script:
     - pip3 install -e .
+    - nosetests
+    - python3 setup.py build_sphinx
+    - cp -r build/sphinx/html public
+  artifacts:
+    paths:
+      - public
+      - build
 
-# Tests 
-#test:
-#  stage: test
-#  tags:
-#    - docker
-#  script:
-#    - pip3 install -e .
-#    - nosetests
-#  artifacts:
-#    when: always
-#    untracked: true
-#    paths:
-#      - build/
-#    expire_in: 8d
-
-# Doc generation
-pages:
-  stage: doc
+#On i686 ubuntu
+ubuntu:i686:
+  image: registry.gitlab.lif.univ-mrs.fr:5005/dev/ltfatpy/ubuntu:i686
   tags:
     - docker
   script:
     - pip3 install -e .
-    - python3 setup.py build_sphinx
-    - cp -r build/sphinx/html public
+    - nosetests
   artifacts:
     paths:
-      - public
+      - build
\ No newline at end of file