diff --git a/packaging/docker/Dockerfile.debian b/packaging/docker/Dockerfile.debian
index ed0008bd1..ad8398c90 100644
--- a/packaging/docker/Dockerfile.debian
+++ b/packaging/docker/Dockerfile.debian
@@ -22,7 +22,8 @@ RUN apt-get update && \
 		autoconf automake autogen libtool \
 		texinfo git curl tar wget diffutils \
 		flex bison \
-		protobuf-compiler protobuf-c-compiler
+		protobuf-compiler protobuf-c-compiler \
+		clang-format clangd
 
 # Dependencies
 RUN apt-get update && \
diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch
index 6e62fba40..d776dbe3b 100644
--- a/packaging/docker/Dockerfile.debian-multiarch
+++ b/packaging/docker/Dockerfile.debian-multiarch
@@ -31,7 +31,8 @@ RUN apt-get update && \
 		autoconf automake autogen libtool \
 		texinfo git curl tar wget diffutils \
 		flex bison \
-		protobuf-compiler protobuf-c-compiler
+		protobuf-compiler protobuf-c-compiler \
+		clang-format clangd
 
 # Build-time dependencies
 RUN apt-get update && \
diff --git a/packaging/docker/Dockerfile.fedora b/packaging/docker/Dockerfile.fedora
index 04f6c3975..88d86d39c 100644
--- a/packaging/docker/Dockerfile.fedora
+++ b/packaging/docker/Dockerfile.fedora
@@ -19,7 +19,8 @@ RUN dnf -y install \
 	autoconf automake autogen libtool \
 	texinfo git curl tar \
 	flex bison \
-	protobuf-compiler protobuf-c-compiler
+	protobuf-compiler protobuf-c-compiler \
+	clang-tools-extra
 
 # Several tools only needed for developement and testing
 RUN dnf -y install \
diff --git a/packaging/docker/Dockerfile.rocky b/packaging/docker/Dockerfile.rocky
index 5f170d314..96b2cd9f6 100644
--- a/packaging/docker/Dockerfile.rocky
+++ b/packaging/docker/Dockerfile.rocky
@@ -24,7 +24,8 @@ RUN dnf --allowerasing -y install \
 	autoconf automake libtool \
 	flex bison \
 	texinfo git curl tar \
-	protobuf-compiler protobuf-c-compiler
+	protobuf-compiler protobuf-c-compiler \
+	clang-tools-extra
 
 # Dependencies
 RUN dnf -y install \
diff --git a/packaging/docker/Dockerfile.ubuntu b/packaging/docker/Dockerfile.ubuntu
index 178912bd6..0bfb82217 100644
--- a/packaging/docker/Dockerfile.ubuntu
+++ b/packaging/docker/Dockerfile.ubuntu
@@ -23,7 +23,8 @@ RUN apt-get update && \
 		autoconf automake autogen libtool \
 		texinfo git curl tar wget diffutils \
 		flex bison \
-		protobuf-compiler protobuf-c-compiler
+		protobuf-compiler protobuf-c-compiler \
+		clang-tools-extra clangd
 
 # Dependencies
 RUN apt-get update && \