diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 29e439b0a97505591a74e2407ba17bcc584f45e4..10b2370f0da96239d070fea606f80aa7e01bca53 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -5,9 +5,7 @@ COPY .docker/wait-for-it.sh /wait-for-it.sh
 
 # build and install caosdb-cpplib
 WORKDIR /libcaosdb/
-RUN mkdir build
-WORKDIR /libcaosdb/build
-RUN conan create -s "compiler.libcxx=libstdc++11" -o caosdb:build_acm=True .. "caosdb/$(conan inspect --raw version ..)@_/_"
+RUN conan create -s "compiler.libcxx=libstdc++11" -o caosdb/*:build_acm=True .
 
 COPY . /caosdb-cppinttest
 WORKDIR /caosdb-cppinttest
@@ -17,10 +15,7 @@ COPY .docker/caosdb-client.json /caosdb-client.json
 
 # Build and run tests.
 # If no other command is given to the Docker image
-CMD mkdir build && \
-    cd build && \
-    conan install .. -s "compiler.libcxx=libstdc++11" && \
-    cmake .. && \
-    cmake --build . && \
+CMD make build-release &&\
+    cd build/Release &&\
     /wait-for-it.sh caosdb-server:10443 -t 500 -- \
     ctest -V