diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f11032a2d62ab42f77f523a918067541c4b5f3cb..84187dafb8056ec94aea44e9aed82bb1ef5ee9a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,8 @@
-image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-util:14.04
-
 variables:
     GIT_SSL_NO_VERIFY: "true"
     GIT_SUBMODULE_STRATEGY: "recursive"
 
-build:
+.build_and_test_template: &build_and_test
     script:
         - mkdir build
         - cd build
@@ -12,3 +10,15 @@ build:
         - make
         - make test
         - make install
+
+build_and_test_12:
+    <<: *build_and_test
+    image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-util:12.04
+
+build_and_test_14:
+    <<: *build_and_test
+    image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-util:14.04
+
+build_and_test_16:
+    <<: *build_and_test
+    image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-util:16.04
diff --git a/README.md b/README.md
index 39520a934e0753ca6b644e68a25e048c49723cfc..f6a14bdd1c629bc9eca54603a182ebd8a0344380 100644
--- a/README.md
+++ b/README.md
@@ -33,10 +33,16 @@ your machine.
    - usual compilation tools (GCC/G++, make, etc.)
  - libtinyxml-dev
 
-Build test container image
+Build test container images
 --------------------------
 
-    cd tests
-    docker login eur0c.laas.fr
-    docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-util:14.04 .
-    docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-util:14.04
+```
+cd tests
+docker login eur0c.laas.fr
+docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-util:12.04 -f Dockerfile.12 .
+docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-util:14.04 -f Dockerfile.14 .
+docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-util:16.04 -f Dockerfile.16 .
+docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-util:12.04
+docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-util:14.04
+docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-util:16.04
+```
diff --git a/tests/Dockerfile.12 b/tests/Dockerfile.12
new file mode 100644
index 0000000000000000000000000000000000000000..524ccfe7174a166b18e6a0ea4f78c2d7b6f3b18a
--- /dev/null
+++ b/tests/Dockerfile.12
@@ -0,0 +1,2 @@
+FROM eur0c.laas.fr:4567/gsaurel/buildfarm/ubuntudc:12.04
+RUN apt-get update -qqy && apt-get install -qqy doxygen doxygen-latex libboost-all-dev libtinyxml-dev cmake git g++ pkg-config
diff --git a/tests/Dockerfile b/tests/Dockerfile.14
similarity index 100%
rename from tests/Dockerfile
rename to tests/Dockerfile.14
diff --git a/tests/Dockerfile.16 b/tests/Dockerfile.16
new file mode 100644
index 0000000000000000000000000000000000000000..292a488eefc46e088d6b8c829c153a846caaad32
--- /dev/null
+++ b/tests/Dockerfile.16
@@ -0,0 +1,2 @@
+FROM eur0c.laas.fr:4567/gsaurel/buildfarm/ubuntudc:16.04
+RUN apt update -qqy && apt install -qqy doxygen doxygen-latex libboost-all-dev libtinyxml-dev cmake git g++ pkg-config