diff --git a/Makefile b/Makefile
index a1e463721011de1db6145c4c2fcb96342b01c2d6..d1b947cb34b3fdae036eb136af95e2fe347cfd4d 100644
--- a/Makefile
+++ b/Makefile
@@ -22,11 +22,11 @@
 # This Makefile is a wrapper for several other scripts.
 
 
-CLANG-FORMAT = clang-format-11
-CLANG-TIDY = clang-tidy-11
+CLANG_FORMAT ?= clang-format-11
+CLANG_TIDY ?= clang-tidy-11
 
 CLANG_TIDY_CHECKS = "--checks=*,-fuchsia-*,-llvmlibc-*,-cert-err58-cpp,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-modernize-use-trailing-return-type,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-cppcoreguidelines-avoid-goto,-hicpp-avoid-goto,-readability-function-cognitive-complexity,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay"
-CLANG_TIDY_CMD = $(CLANG-TIDY) \
+CLANG_TIDY_CMD = $(CLANG_TIDY) \
   --header-filter=caosdb/.*[^\(\.pb\.h\)]$ \
   --fix \
   $(CLANG_TIDY_CHECKS)
@@ -43,7 +43,7 @@ conan-install:
 .PHONY: conan-install
 
 format: conan-install
-	$(CLANG-FORMAT) -i --verbose \
+	$(CLANG_FORMAT) -i --verbose \
 	 $$(find test/ -type f -iname "*.cpp" -o -iname "*.h" -o -iname "*.h.in")
 	$(CLANG_TIDY_CMD) $$(find test/ -type f -iname "*.cpp" -o -iname "*.h" -o -iname "*.h.in")
 .PHONY: format
diff --git a/conanfile.txt b/conanfile.txt
index 30ffb6e9f904c6b0fad492b791f7ed7e685713eb..6d77640a639a25123df3f4b72158d93db4cb9924 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -1,5 +1,5 @@
 [requires]
-caosdb/0.0.21
+caosdb/0.1.0
 
 [build_requires]
 gtest/1.11.0