diff --git a/Dockerfile_dependencies b/Dockerfile_dependencies
index 2ab4aaae1..b19ab841d 100644
--- a/Dockerfile_dependencies
+++ b/Dockerfile_dependencies
@@ -8,6 +8,11 @@ RUN apt update && apt dist-upgrade -y \
 
 RUN pip install conan==2.8.1
 
+RUN apt install -y software-properties-common wget gnupg lsb-release wget jq curl \
+    && wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
+    && add-apt-repository 'deb http://apt.llvm.org/jammy/  llvm-toolchain-jammy main' \
+    && apt install -y clang-tidy-15
+
 WORKDIR /src
 COPY conanfile.py conanprofile.docker conanprofile.docker_arm ./
 RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
@@ -17,3 +22,4 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
     fi
 
 RUN conan install . --build=missing --profile ./conanprofile --profile:build ./conanprofile --output-folder=build/Release/generators
+RUN conan install . --build=missing --profile ./conanprofile --profile:build ./conanprofile --output-folder=build/Debug/generators -s build_type=Debug
diff --git a/Dockerfile_linter b/Dockerfile_linter
index 65729e0c7..8dd5979f4 100644
--- a/Dockerfile_linter
+++ b/Dockerfile_linter
@@ -1,4 +1,4 @@
-ARG DEPENDENCY_IMAGE=ghcr.io/genspectrum/lapis-silo-linter-dependencies:latest
+ARG DEPENDENCY_IMAGE=ghcr.io/genspectrum/lapis-silo-dependencies:latest
 
 FROM $DEPENDENCY_IMAGE AS linter
 ARG THREADS=4
@@ -7,4 +7,5 @@ WORKDIR /src
 
 COPY . ./
 
-RUN python3 ./build_with_conan.py --parallel $THREADS --build_with_clang_tidy
+RUN cmake -D BUILD_WITH_CLANG_TIDY=ON -D CMAKE_BUILD_TYPE=Debug -B build/Debug
+RUN cmake --build build/Debug
diff --git a/Dockerfile_linter_dependencies b/Dockerfile_linter_dependencies
deleted file mode 100644
index fc5af634d..000000000
--- a/Dockerfile_linter_dependencies
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM ubuntu:22.04
-
-WORKDIR /src
-
-RUN apt update \
-    && apt install -y \
-    cmake python3-pip software-properties-common wget gnupg lsb-release \
-    && wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
-    && add-apt-repository 'deb http://apt.llvm.org/jammy/  llvm-toolchain-jammy main' \
-    && apt install -y clang-tidy-15 \
-    && apt install -y jq \
-    && apt install -y curl
-
-RUN pip install conan==2.8.1
-
-COPY conanfile.py conanprofile.docker ./
-RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
-        mv conanprofile.docker_arm conanprofile; \
-    else \
-        mv conanprofile.docker conanprofile; \
-    fi
-
-RUN conan install . --build=missing --profile ./conanprofile --profile:build ./conanprofile --output-folder=build/Debug/generators -s build_type=Debug