diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 629940424f030db0fa52dd8fd6180c6f9a0194f6..272985fb37a8655c81c7774f6d472ba0cf86ea0f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,26 +2,27 @@
 stages:
   - build
   - test
+  - doc
 
 # Global runner/docker image definition
-image: ubuntu:latest
+image: registry.gitlab.lif.univ-mrs.fr:5005/dev/ltfatpy/ltfatpy_ubuntu_16.04
 
 # Global caching 
-cache:
-  key: "cache"
-  paths:
+#cache:
+#  key: "cache"
+#  paths:
 # apt
-    - apt-cache
+#    - apt-cache
 # build
-    - 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
-  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y liblapack-dev python3.5 python3.5-dev python3-pip python3-tk
-  - pip3 install --upgrade pip
-  - pip3 install scipy matplotlib nose coverage cython
-  - pip3 list
+#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
+#  - apt-get -o dir::cache::archives="$APT_CACHE_DIR" install -y liblapack-dev python3.5 python3.5-dev python3-pip python3-tk
+#  - pip3 install --upgrade pip
+#  - pip3 install scipy matplotlib nose coverage cython
+#  - pip3 list
 
 # Main build 
 build: 
@@ -46,3 +47,14 @@ test:
       - build/
     expire_in: 8d
 
+# Doc generation
+pages:
+  stage: doc
+  tags:
+    - docker
+  script:
+    - python3 setup.py build_sphinx
+    - cp -r build/sphinx/html public
+  artifacts:
+    paths:
+      - public
diff --git a/doc/conf.py b/doc/conf.py
index e9d6a755deff8f714ed95c1413b94169b7f7365c..8e95f3318807eecbb82e80168a498708b3e3264b 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -44,7 +44,7 @@ extensions = [
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
-    'sphinx.ext.pngmath',
+    'sphinx.ext.imgmath',
     'sphinx.ext.ifconfig',
     'sphinx.ext.viewcode',
     'sphinxcontrib.bibtex'
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4065ceaead73eba3da106e714b592c518e5ddde0..86f34ba684d25335a8259af5d275c5910750223e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,5 @@
-FROM ubuntu:latest
+#FROM ubuntu:latest
+FROM ioft/i386-ubuntu
 MAINTAINER Denis Arrivault
 WORKDIR /
 RUN apt-get update && apt-get install -y \
@@ -8,8 +9,10 @@ RUN apt-get update && apt-get install -y \
     python3 \
     python3-dev \
     python3-pip \
-    python3-tk
+    python3-tk \
+    libfreetype6
 RUN pip3 install --upgrade pip
 RUN pip3 install scipy matplotlib nose coverage pytest pytest-cov Sphinx sphinxcontrib-bibtex
+ADD ltfatpy-1.0.8 /
 # cleanup
 RUN apt-get -qy autoremove
\ No newline at end of file