diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 61c6d62f81ecd8e3f8c5a66cfd999a5121f757ad..8ae7ca4dedbf7dde6c00e39ff28ed7dd7915f427 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -4,7 +4,7 @@ RUN apt-get update
 RUN apt-get install -y cmake
 RUN apt-get install -y lcov
 RUN apt-get install -y doxygen graphviz
-RUN apt-get install -y clang-format clang-tidy
+RUN apt-get install -y clang-format-16 clang-tidy
 RUN apt-get install -y python3-pip python3-venv
 RUN apt-get install -y git  
 RUN apt-get install -y curl zip unzip tar
@@ -28,5 +28,5 @@ RUN git rev-parse HEAD > libcaosdb_commit
 RUN rm -rf .git
 
 # build dependencies
-RUN /venv/bin/conan install /libcaosdb --build=missing -s build_type=Debug
-RUN /venv/bin/conan install /libcaosdb --build=missing -s build_type=Release
+#RUN /venv/bin/conan install /libcaosdb --build=missing -s build_type=Debug
+#RUN /venv/bin/conan install /libcaosdb --build=missing -s build_type=Release
diff --git a/Makefile b/Makefile
index 47e9c565a7795943d43fe5b10e3c0f82f61e0ae2..368cb1b8a5f9629586cdf1dfe93d3ebdfbd213aa 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 # This Makefile is a wrapper for several other scripts.
 
 
-CLANG_FORMAT ?= clang-format
+CLANG_FORMAT ?= clang-format-16
 CONAN_SETTINGS = "compiler.libcxx=libstdc++11"
 
 # OS specific handling, with code by Ken Jackson and oHo,