diff --git a/dockerfiles/drbd-driver-loader/Dockerfile.bionic b/dockerfiles/drbd-driver-loader/Dockerfile.bionic
index 6313fe8..0d8210e 100644
--- a/dockerfiles/drbd-driver-loader/Dockerfile.bionic
+++ b/dockerfiles/drbd-driver-loader/Dockerfile.bionic
@@ -1,7 +1,19 @@
 FROM ubuntu:bionic
-MAINTAINER Roland Kammerer <roland.kammerer@linbit.com>
 
-RUN apt-get update && apt-get upgrade -y && apt-get install -y kmod gnupg wget make gcc patch curl && apt-get clean
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install --no-install-recommends -y \
+      ca-certificates \
+      kmod \
+      gnupg \
+      wget \
+      make \
+      # Ubuntu has multiple kernel versions that may be using different gcc versions: use the dkms package to install them all
+      $(apt-get install -s dkms | awk '/^Inst gcc/{print $2}') \
+      patch \
+      elfutils \
+      curl && \
+    apt-get clean
 
 ARG DRBD_VERSION
 RUN wget https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -O /drbd.tar.gz && \
diff --git a/dockerfiles/drbd-driver-loader/Dockerfile.focal b/dockerfiles/drbd-driver-loader/Dockerfile.focal
index 075a031..301fc9c 100644
--- a/dockerfiles/drbd-driver-loader/Dockerfile.focal
+++ b/dockerfiles/drbd-driver-loader/Dockerfile.focal
@@ -1,7 +1,19 @@
 FROM ubuntu:focal
-MAINTAINER Roland Kammerer <roland.kammerer@linbit.com>
 
-RUN apt-get update && apt-get upgrade -y && apt-get install -y kmod gnupg wget make gcc patch elfutils curl && apt-get clean
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install --no-install-recommends -y \
+      ca-certificates \
+      kmod \
+      gnupg \
+      wget \
+      make \
+      # Ubuntu has multiple kernel versions that may be using different gcc versions: use the dkms package to install them all
+      $(apt-get install -s dkms | awk '/^Inst gcc/{print $2}') \
+      patch \
+      elfutils \
+      curl && \
+    apt-get clean
 
 ARG DRBD_VERSION
 RUN wget https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -O /drbd.tar.gz && \
diff --git a/dockerfiles/drbd-driver-loader/Dockerfile.jammy b/dockerfiles/drbd-driver-loader/Dockerfile.jammy
index ff8a41b..59bda38 100644
--- a/dockerfiles/drbd-driver-loader/Dockerfile.jammy
+++ b/dockerfiles/drbd-driver-loader/Dockerfile.jammy
@@ -1,6 +1,19 @@
 FROM ubuntu:jammy
 
-RUN apt-get update && apt-get upgrade -y && apt-get install -y kmod gnupg wget make gcc patch elfutils curl && apt-get clean
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install --no-install-recommends -y \
+      ca-certificates \
+      kmod \
+      gnupg \
+      wget \
+      make \
+      # Ubuntu has multiple kernel versions that may be using different gcc versions: use the dkms package to install them all
+      $(apt-get install -s dkms | awk '/^Inst gcc/{print $2}') \
+      patch \
+      elfutils \
+      curl && \
+    apt-get clean
 
 ARG DRBD_VERSION
 RUN wget https://pkg.linbit.com/downloads/drbd/9/drbd-${DRBD_VERSION}.tar.gz -O /drbd.tar.gz && \