diff --git a/.travis.yml b/.travis.yml
index fb2db8307e3f369739c7837d21ddeaa949973d9a..64ec3eeb48f0dcd7d1334def2707af37d4fefdbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,11 @@ language: cpp
 
 before_install:
 - docker pull aberaud/opendht-deps
+- docker pull aberaud/opendht-deps-llvm
 
 script:
-- docker build .
+- docker build -f docker/DockerfileTravis .
+- docker build -f docker/DockerfileTravisLlvm .
 
 notifications:
   email:
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..304510c3f751def28a924ca64e0031415d89adfa
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,6 @@
+FROM aberaud/opendht-deps
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+RUN git clone https://github.com/savoirfairelinux/opendht.git \
+	&& cd opendht && mkdir build && cd build \
+	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && make install \
+	&& cd ../.. && rm -rf opendht
\ No newline at end of file
diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps
new file mode 100644
index 0000000000000000000000000000000000000000..b17a99275186ead3960f04bbd48eb9961dc9251c
--- /dev/null
+++ b/docker/DockerfileDeps
@@ -0,0 +1,9 @@
+FROM ubuntu:16.04
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+RUN apt-get update && apt-get install -y build-essential cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls-dev cython3 python3-dev python3-setuptools
+RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-1.4.2/msgpack-1.4.2.tar.gz \
+	&& tar -xzf msgpack-1.4.2.tar.gz \
+	&& cd msgpack-1.4.2 && mkdir build && cd build \
+	&& cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \
+	&& make -j8 && make install \
+	&& cd ../.. && rm -rf msgpack-1.4.2
diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm
new file mode 100644
index 0000000000000000000000000000000000000000..8c8ccf43ed54ebb688b776ebd599c11aa0c255cc
--- /dev/null
+++ b/docker/DockerfileDepsLlvm
@@ -0,0 +1,11 @@
+FROM ubuntu:16.04
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+RUN apt-get update \
+	&& apt-get install -y llvm clang make cmake git wget libncurses5-dev libreadline-dev nettle-dev libgnutls-dev cython3 python3-dev python3-setuptools \
+	&& apt-get remove -y gcc g++ && apt-get autoremove -y && apt-get clean
+RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-1.4.2/msgpack-1.4.2.tar.gz \
+	&& tar -xzf msgpack-1.4.2.tar.gz \
+	&& cd msgpack-1.4.2 && mkdir build && cd build \
+	&& cmake -DMSGPACK_CXX11=ON -DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX=/usr .. \
+	&& make -j8 && make install \
+	&& cd ../.. && rm -rf msgpack-1.4.2
diff --git a/docker/DockerfileLlvm b/docker/DockerfileLlvm
new file mode 100644
index 0000000000000000000000000000000000000000..a66981fdc69379b1b9825d012abe6af38accfbce
--- /dev/null
+++ b/docker/DockerfileLlvm
@@ -0,0 +1,6 @@
+FROM aberaud/opendht-deps-llvm
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+RUN git clone https://github.com/savoirfairelinux/opendht.git \
+	&& cd opendht && mkdir build && cd build \
+	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && make install \
+	&& cd ../.. && rm -rf opendht
\ No newline at end of file
diff --git a/Dockerfile b/docker/DockerfileTravis
similarity index 75%
rename from Dockerfile
rename to docker/DockerfileTravis
index 51e93acb833ef7b355ef1f17b3fbf39b8e3f597d..c810ba715da3ef00355cf449754ee5b8247b7ea1 100644
--- a/Dockerfile
+++ b/docker/DockerfileTravis
@@ -2,5 +2,5 @@ FROM aberaud/opendht-deps
 MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 COPY . /root/opendht
 RUN cd /root/opendht && mkdir build && cd build \
-	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && make install \
+	&& cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make -j8 && make install \
 	&& cd ../.. && rm -rf opendht
diff --git a/docker/DockerfileTravisLlvm b/docker/DockerfileTravisLlvm
new file mode 100644
index 0000000000000000000000000000000000000000..94f894790d44c834083399b57ee64a6e458a5e74
--- /dev/null
+++ b/docker/DockerfileTravisLlvm
@@ -0,0 +1,6 @@
+FROM aberaud/opendht-deps-llvm
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+COPY . /root/opendht
+RUN cd /root/opendht && mkdir build && cd build \
+	&& cmake -DCMAKE_INSTALL_PREFIX=/usr .. && make -j8 && make install \
+	&& cd ../.. && rm -rf opendht