diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 854502707576faa45349a46c82a92556149d2cd4..45c555187b3ade6e1f9e21bbb79addd9f61f00eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,28 +1,44 @@
 # CI Config for ltaftpy / gitlab
 
-# Tests on X86_64 ubuntu
-ubuntu:X86_64:
-  image: registry.gitlab.lis-lab.fr:5005/dev/ltfatpy/ubuntu:X86_64
-  tags:
-    - docker
-  script:
-    - pip3 install -e . --no-deps
-    - py.test-3
-  artifacts:
-    when: always
-    untracked: true
-    paths:
-      - build
-    expire_in: 8d
+default:
+  cache:                      # Pip's cache doesn't store the python packages
+    paths:                    # https://pip.pypa.io/en/stable/topics/caching/
+      - .cache/pip
+  before_script:
+    - apt-get update
+    - apt-get install -y --no-install-recommends cmake
+    - apt-get install -y --no-install-recommends gcc
+    - apt-get install -y --no-install-recommends g++
+    - apt-get install -y --no-install-recommends make
+    - apt-get install -y --no-install-recommends libfftw3-dev
+    - apt-get install -y --no-install-recommends liblapack-dev
+    - apt-get install -y --no-install-recommends python3
+    - apt-get install -y --no-install-recommends python3-dev
+    - apt-get install -y --no-install-recommends python3-setuptools
+    - apt-get install -y --no-install-recommends python3-pytest
+    - apt-get install -y --no-install-recommends python3-pytest-cov
+    - apt-get install -y --no-install-recommends python3-coverage
+    - apt-get install -y --no-install-recommends libjs-jquery-hotkeys
+    - apt-get install -y --no-install-recommends libjs-jquery-isonscreen
+    - apt-get install -y --no-install-recommends libjs-jquery-tablesorter
+    - apt-get install -y --no-install-recommends python3-pip
+    - apt-get install -y --no-install-recommends python3-wheel
+    - apt-get install -y --no-install-recommends python3-tk
+    - apt-get install -y --no-install-recommends python3-matplotlib
+    - apt-get install -y --no-install-recommends python3-scipy
+    - apt-get install -y --no-install-recommends texlive-latex-extra
+    - apt-get install -y --no-install-recommends dvipng
+    - apt-get clean
+    - pip install virtualenv
+    - virtualenv venv
+    - source venv/bin/activate
 
-# Tests on i686 ubuntu
-ubuntu:i686:
-  image: registry.gitlab.lis-lab.fr:5005/dev/ltfatpy/ubuntu:i686
-  tags:
-    - docker
+install_and_test_39:
+  image: python:3.9
   script:
+    - dpkg -L python3-pytest | xargs file | grep executable
     - pip3 install -e . --no-deps
-    - py.test-3
+    - python3 -m pytest
   artifacts:
     when: always
     untracked: true
@@ -30,9 +46,40 @@ ubuntu:i686:
       - build
     expire_in: 8d
 
+# # Tests on X86_64 ubuntu
+# ubuntu:X86_64:
+#   image: registry.gitlab.lis-lab.fr:5005/dev/ltfatpy/ubuntu:X86_64
+#   tags:
+#     - docker
+#   script:
+#     - pip3 install -e . --no-deps
+#     - py.test-3
+#   artifacts:
+#     when: always
+#     untracked: true
+#     paths:
+#       - build
+#     expire_in: 8d
+
+# # Tests on i686 ubuntu
+# ubuntu:i686:
+#   image: registry.gitlab.lis-lab.fr:5005/dev/ltfatpy/ubuntu:i686
+#   tags:
+#     - docker
+#   script:
+#     - pip3 install -e . --no-deps
+#     - py.test-3
+#   artifacts:
+#     when: always
+#     untracked: true
+#     paths:
+#       - build
+#     expire_in: 8d
+
 # doc template
 .doc: &doc
   script:
+    - pip3 install setuptools sphinx
     - pip3 install -e . --no-deps
     - python3 setup.py build_sphinx
     - cp -r build/sphinx/html public
@@ -43,7 +90,8 @@ ubuntu:i686:
 # Doc Generation
 pages:
   <<: *doc
-  image: registry.gitlab.lis-lab.fr:5005/dev/ltfatpy/ubuntu:X86_64
+  # image: registry.gitlab.lis-lab.fr:5005/dev/ltfatpy/ubuntu:X86_64
+  image: python:3.9
   tags:
     - docker
   only: