diff --git a/.env.sample b/.env.sample
index e31c2152d07b33c7fd8c8a6c9fa3da3e64bcf308..c1c5f61f6188aed01132502327d868ef1f821710 100644
--- a/.env.sample
+++ b/.env.sample
@@ -2,3 +2,4 @@ RESTART=no
 APP_DEBUG=false
 DEV_PORT=5000
 GIT_REF=master
+GIT_REF_VOCABULARY=master
diff --git a/Dockerfile b/Dockerfile
index f59c65889b0effcf02fcd4d1d08e9171195feddf..9b41dd59dad1bf06813b866228be398124d2dbe8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,16 +16,22 @@ RUN apt-get install -y \
 
 WORKDIR /opt
 
-RUN git clone https://gitlab.tetras-libre.fr/unl/unl2rdf
 
-WORKDIR /opt/unl2rdf
+RUN git clone https://gitlab.tetras-libre.fr/unl/unlTools
 
-ARG GIT_REF=master
+RUN git clone https://gitlab.tetras-libre.fr/unl/rdf-vocabulary
+
+WORKDIR /opt/rdf-vocabulary
+
+ARG GIT_REF_VOCABULARY=master
 
-RUN git pull
-RUN git checkout $GIT_REF
+RUN git pull && git checkout $GIT_REF_VOCABULARY && mvn install
+
+WORKDIR /opt/unlTools
+
+ARG GIT_REF=master
 
-RUN mvn package
+RUN git pull && git checkout $GIT_REF && mvn package
 
 FROM base
 
@@ -46,7 +52,7 @@ RUN a2dissite 000-default
 
 RUN a2ensite flask
 
-COPY --from=builder /opt/unl2rdf/unl2rdf-app/target/unl2rdf-app-*-with-dependencies.jar /opt/unl2rdf.jar
+COPY --from=builder /opt/unlTools/unl2rdf-app/target/unl2rdf-app-*-with-dependencies.jar /opt/unl2rdf.jar
 
 # Force code reloading
 RUN sed -i 's/^\(\s*MaxConnectionsPerChild\s*\) 0/\1 1/g' /etc/apache2/mods-enabled/mpm_event.conf
diff --git a/docker-compose.yml b/docker-compose.yml
index 6fc2d366922ea08c3ef620068663df17959331d8..63090bff894c5dc632d20f4aba9cd5883fb08363 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,8 @@ services:
         build:
           context: .
           args:
-            GIT_REF: ${GIT_REF}
+            GIT_REF:
+            GIT_REF_VOCABULARY:
         volumes:
           - "./src:/var/www/app"
         environment: