diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 455b1dc7a80bc1689a89cfc7080a475c5c5f9d51..3485ee074caca5b8fbd4b44562f48804a249baad 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -5,9 +5,3 @@ RUN apt-get update && apt-get install -y git python3-pip
 RUN apt-get install -y cmake/buster-backports
 RUN pip3 install conan
 
-WORKDIR /
-RUN git clone https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git
-WORKDIR /caosdb-cpplib
-RUN git checkout f-extern-c
-RUN git submodule update --init --recursive
-RUN rm -rf ../.git
diff --git a/.docker/install_cpplib.sh b/.docker/install_cpplib.sh
index 03da3b113db1bdb348bb8a646c1e74471d42fbdd..a48d8f1d6f09c271b1223b94399a3e4d1cc12c5d 100644
--- a/.docker/install_cpplib.sh
+++ b/.docker/install_cpplib.sh
@@ -1,9 +1,11 @@
-current_dir=${pwd}
-cd /caosdb-cpplib
+git clone https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git
+git checkout f-extern-c
+git submodule update --init --recursive
+cd caosdb-cpplib
 mkdir build
 cd build
 conan install .. -s "compiler.libcxx=libstdc++11"
 cmake ..
 cmake --build .
 cmake --install .
-cd ${current_dir}
+cd ../..