diff --git a/images/.hadolint.yaml b/images/.hadolint.yaml
index 8f2292c1e..7351d488e 100644
--- a/images/.hadolint.yaml
+++ b/images/.hadolint.yaml
@@ -4,10 +4,10 @@ ignored:
   - DL3003
   # Always tag the version of an image explicitly: https://github.com/hadolint/hadolint/wiki/DL3006
   - DL3006
+  # Pin versions in apt get install: https://github.com/hadolint/hadolint/wiki/DL3008
+  - DL3008
   # Pin versions in apk add: https://github.com/hadolint/hadolint/wiki/DL3018
   - DL3018
-  # Do not use apt as it is meant to be an end-user tool, use apt-get or apt-cache instead: https://github.com/hadolint/hadolint/wiki/DL3027
-  - DL3027
   # Specify version with zypper install -y <package>[=]<version>: https://github.com/hadolint/hadolint/wiki/DL3037
   - DL3037
   # dnf clean all missing after dnf command: https://github.com/hadolint/hadolint/wiki/DL3040
diff --git a/images/Dockerfile.debian b/images/Dockerfile.debian
index 7eca61c16..fe13eddee 100644
--- a/images/Dockerfile.debian
+++ b/images/Dockerfile.debian
@@ -5,36 +5,70 @@ FROM $BASE_IMAGE
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt update
-RUN apt update
-RUN apt install -y \
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+    binutils \
     conntrack \
+    console-setup \
     coreutils \
+    cryptsetup \
     curl \
     debianutils \
+    dmraid \
     dosfstools \
     dracut \
     dracut-live \
     dracut-network \
     e2fsprogs \
+    e2fsprogs-l10n \
+    efibootmgr \
+    ethtool \
+    firmware-linux-free \
+    fuse3 \
     gawk \
+    gnupg \
+    gnupg1-l10n \
     grub-efi-amd64-bin \
+    grub-efi-amd64-signed \
     grub-pc-bin \
     grub2 \
     grub2-common \
     haveged \
     iproute2 \
     iptables \
+    isc-dhcp-common \
     jq \
+    krb5-locales \
+    libatm1 \
+    libglib2.0-data \
+    libgpm2 \
+    libldap-common \
+    libnss-systemd \
+    libpam-cap \
+    libsasl2-modules \
     linux-image-amd64 \
+    lvm2 \
+    mdadm \
     nano \
+    nbd-client \
+    ncurses-term \
     neovim \
+    nfs-common \
+    nftables \
+    open-iscsi \
     open-vm-tools \
     openssh-server \
+    os-prober \
     parted \
     patch \
+    pigz \
+    pkg-config \
     polkitd \
+    psmisc \
+    publicsuffix \
+    python3-pynvim \
     rsync \
+    shared-mime-info \
     snapd \
     squashfs-tools \
     sudo \
@@ -42,8 +76,13 @@ RUN apt install -y \
     systemd-sysv \
     systemd-timesyncd \
     tar \
+    xauth \
+    xclip \
+    xdg-user-dirs \
+    xxd \
     xz-utils \
-    && apt-get clean
+    zerofree \
+  && rm -rf /var/lib/apt/lists/*
 
 RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install
 RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv
@@ -65,4 +104,4 @@ RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo
 
 
 # Clear cache
-RUN apt-get clean && rm -rf /var/cache/* && journalctl --vacuum-size=1K && rm /etc/machine-id && rm /var/lib/dbus/machine-id && rm /etc/hostname
+RUN rm -rf /var/cache/* && journalctl --vacuum-size=1K && rm /etc/machine-id && rm /var/lib/dbus/machine-id && rm /etc/hostname
diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu
index afa452f88..8ecd0d583 100644
--- a/images/Dockerfile.ubuntu
+++ b/images/Dockerfile.ubuntu
@@ -4,45 +4,89 @@ FROM $BASE_IMAGE
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt update
-RUN apt install -y software-properties-common
-RUN add-apt-repository ppa:oibaf/test
-RUN apt update
-RUN apt install -y \
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+    gnupg \
+    software-properties-common \
+  && add-apt-repository ppa:oibaf/test \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends \
+    binutils \
     conntrack \
     console-data \
+    console-setup \
     coreutils \
+    cryptsetup \
     curl \
+    dbus-user-session \
     debianutils \
+    dmsetup \
     dosfstools \
     dracut \
     dracut-live \
     dracut-network \
     e2fsprogs \
+    efibootmgr \
+    ethtool \
+    firmware-sof-signed \
+    fuse3 \
     gawk \
     grub-efi-amd64-bin \
+    grub-efi-amd64-signed \
     grub-pc-bin \
     grub2 \
     grub2-common \
     haveged \
     iproute2 \
     iptables \
+    isc-dhcp-common \
     jq \
+    kbd \
+    krb5-locales \
+    libatm1 \
+    libldap-common \
+    libnss-systemd \
+    libpam-cap \
+    libsasl2-modules \
     linux-image-generic-hwe-22.04 \
+    lvm2 \
+    mdadm \
     nano \
+    nbd-client \
+    ncurses-term \
     neovim \
+    networkd-dispatcher \
+    nfs-common \
+    open-iscsi \
     open-vm-tools \
     openssh-server \
+    os-prober \
+    packagekit-tools \
     parted \
+    pigz \
+    pkg-config \
     polkitd \
+    publicsuffix \
+    python3-pynvim \
     rsync \
+    shared-mime-info \
     snapd \
     squashfs-tools \
+    ssh-import-id \
     sudo \
     systemd \
+    systemd-hwe-hwdb \
+    systemd-resolved \
     systemd-timesyncd \
-    tar \
-    && apt-get clean
+    thermald \
+    unattended-upgrades \
+    xauth \
+    xclip \
+    xdg-user-dirs \
+    xxd \
+    xz-utils \
+    zerofree \
+  && rm -rf /var/lib/apt/lists/*
 
 RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install
 RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv
@@ -58,4 +102,4 @@ RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo
 
 
 # Clear cache
-RUN apt-get clean && rm -rf /var/cache/* && journalctl --vacuum-size=1K && rm /etc/machine-id && rm /var/lib/dbus/machine-id && rm /etc/hostname
+RUN rm -rf /var/cache/* && journalctl --vacuum-size=1K && rm /etc/machine-id && rm /var/lib/dbus/machine-id && rm /etc/hostname
diff --git a/images/Dockerfile.ubuntu-20-lts b/images/Dockerfile.ubuntu-20-lts
index 1e9952010..ac6635469 100644
--- a/images/Dockerfile.ubuntu-20-lts
+++ b/images/Dockerfile.ubuntu-20-lts
@@ -4,46 +4,86 @@ FROM $BASE_IMAGE
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt update
-RUN apt install -y software-properties-common
-RUN add-apt-repository ppa:oibaf/test
-RUN apt update
-RUN apt install -y \
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+    gnupg \
+    software-properties-common \
+  && add-apt-repository ppa:oibaf/test \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends \
+    binutils \
     conntrack \
     console-data \
+    console-setup \
     coreutils \
+    cryptsetup \
     curl \
     debianutils \
+    dmsetup \
     dosfstools \
     dracut \
     dracut-network \
     e2fsprogs \
+    efibootmgr \
+    ethtool \
+    file \
+    fuse \
     gawk \
     grub-efi-amd64-bin \
+    grub-efi-amd64-signed \
     grub-pc-bin \
     grub2 \
     grub2-common \
     haveged \
     iproute2 \
     iptables \
+    isc-dhcp-common \
     jq \
+    kbd \
+    krb5-locales \
+    libatm1 \
+    libfile-fcntllock-perl \
+    liblocale-gettext-perl \
+    libnss-systemd \
+    libpam-cap \
+    libsasl2-modules \
     linux-image-generic-hwe-20.04 \
     lldpd \
+    lvm2 \
+    mdadm \
     nano \
+    nbd-client \
+    ncurses-term \
     neovim \
+    networkd-dispatcher \
+    nfs-common \
+    open-iscsi \
     open-vm-tools \
     openssh-server \
+    os-prober \
+    packagekit-tools \
     parted \
     policykit-1 \
+    publicsuffix \
+    python3-neovim \
     rsync \
+    shared-mime-info \
     snapd \
     snmpd \
     squashfs-tools \
+    ssh-import-id \
     sudo \
     systemd \
     systemd-timesyncd \
-    tar \
-    && apt-get clean
+    thermald \
+    unattended-upgrades \
+    xauth \
+    xclip \
+    xdg-user-dirs \
+    xxd \
+    xz-utils \
+    zerofree \
+  && rm -rf /var/lib/apt/lists/*
 
 RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install
 RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv
@@ -59,4 +99,4 @@ RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo
 
 
 # Clear cache
-RUN apt-get clean && rm -rf /var/cache/* && journalctl --vacuum-size=1K && rm /etc/machine-id && rm /var/lib/dbus/machine-id && rm /etc/hostname
+RUN rm -rf /var/cache/* && journalctl --vacuum-size=1K && rm /etc/machine-id && rm /var/lib/dbus/machine-id && rm /etc/hostname
diff --git a/images/Dockerfile.ubuntu-22-lts b/images/Dockerfile.ubuntu-22-lts
index 42cf1e67f..6290e3d22 100644
--- a/images/Dockerfile.ubuntu-22-lts
+++ b/images/Dockerfile.ubuntu-22-lts
@@ -4,47 +4,90 @@ FROM $BASE_IMAGE
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt update
-RUN apt install -y software-properties-common
-RUN add-apt-repository ppa:oibaf/test
-RUN apt update
-RUN apt install -y \
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+    gnupg \
+    software-properties-common \
+  && add-apt-repository ppa:oibaf/test \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends \
+    binutils \
+    bzip2 \
     conntrack \
     console-data \
+    console-setup \
     coreutils \
+    cryptsetup \
     curl \
     debianutils \
+    dmsetup \
     dosfstools \
     dracut \
     dracut-live \
     dracut-network \
     e2fsprogs \
+    efibootmgr \
+    ethtool \
+    firmware-sof-signed \
+    fuse3 \
     gawk \
     grub-efi-amd64-bin \
+    grub-efi-amd64-signed \
     grub-pc-bin \
     grub2 \
     grub2-common \
     haveged \
     iproute2 \
     iptables \
+    isc-dhcp-common \
     jq \
+    kbd \
+    libatm1 \
+    libfile-fcntllock-perl \
+    libldap-common \
+    liblocale-gettext-perl \
+    libnss-systemd \
+    libpam-cap \
+    libsasl2-modules \
     linux-image-generic-hwe-22.04 \
     lldpd \
+    lvm2 \
+    mdadm \
     nano \
+    nbd-client \
+    ncurses-term \
     neovim \
+    networkd-dispatcher \
+    nfs-common \
+    open-iscsi \
     open-vm-tools \
     openssh-server \
+    os-prober \
+    packagekit-tools \
     parted \
+    pigz \
     polkitd \
+    publicsuffix \
+    python3-neovim \
     rsync \
+    shared-mime-info \
     snapd \
     snmpd \
     squashfs-tools \
+    ssh-import-id \
     sudo \
     systemd \
+    systemd-hwe-hwdb \
     systemd-timesyncd \
-    tar \
-    && apt-get clean
+    thermald \
+    unattended-upgrades \
+    xauth \
+    xclip \
+    xdg-user-dirs \
+    xxd \
+    xz-utils \
+    zerofree \
+  && rm -rf /var/lib/apt/lists/*
 
 RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install
 RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv
@@ -60,4 +103,4 @@ RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo
 
 
 # Clear cache
-RUN apt-get clean && rm -rf /var/cache/* && journalctl --vacuum-size=1K && rm /etc/machine-id && rm /var/lib/dbus/machine-id && rm /etc/hostname
+RUN rm -rf /var/cache/* && journalctl --vacuum-size=1K && rm /etc/machine-id && rm /var/lib/dbus/machine-id && rm /etc/hostname