diff --git a/.hadolint.yml b/.hadolint.yml
index 04d19ca1f..a5c519583 100644
--- a/.hadolint.yml
+++ b/.hadolint.yml
@@ -4,3 +4,4 @@ ignored:
   - DL3007
   - DL3008
   - DL3013
+  - DL3066
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 118e35ee6..f32b28223 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -40,13 +40,13 @@ repos:
         exclude: LICENSE.md
 
   - repo: https://github.com/hadolint/hadolint
-    rev: 57e1618d78fd469a92c1e584e8c9313024656623 # frozen: v2.14.0
+    rev: 2eece55955ced00200be9729e9728cb7dacca505 # frozen: v2.15.1
     hooks:
       - id: hadolint-docker
         # hadolint-docker is a special hook that runs hadolint in a Docker container
         # Docker is not installed in the environment where pre-commit is run
         stages: [manual]
-        entry: hadolint/hadolint:v2.14.0 hadolint
+        entry: hadolint/hadolint:v2.15.1 hadolint
 
   - repo: https://github.com/codespell-project/codespell
     rev: 57b21406f092110c18776e39b0bda50d37c945c8 # frozen: v2.4.3
@@ -107,7 +107,7 @@ repos:
         types: [c++]
 
   - repo: https://github.com/BlankSpruce/gersemi-pre-commit
-    rev: e98930bdc210d3387007f9252d8c1694ea7e410f # frozen: 0.27.7
+    rev: b9d6d13dc9b753c5ff24ed5f8470671189c3fcf0 # frozen: 0.28.0
     hooks:
       - id: gersemi
 
diff --git a/docker/pre-commit/Dockerfile b/docker/pre-commit/Dockerfile
deleted file mode 100644
index 1d012bf0e..000000000
--- a/docker/pre-commit/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-ARG GHCR_REPO=invalid
-FROM ${GHCR_REPO}/clio-tools:latest AS clio-tools
-
-# We're using Ubuntu 24.04 to have a more recent version of Python
-FROM ubuntu:24.04
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-# hadolint ignore=DL3002
-USER root
-WORKDIR /root
-
-# Install common tools and dependencies
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends --no-install-suggests \
-        curl \
-        git \
-        libatomic1 \
-        software-properties-common \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install Python tools
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends --no-install-suggests \
-        python3 \
-        python3-pip \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN pip install -q --no-cache-dir --break-system-packages \
-        pre-commit
-
-COPY --from=clio-tools \
-    /usr/local/bin/doxygen \
-    /usr/local/bin/