diff --git a/dockerfiles/debian b/dockerfiles/debian
index 55a3f93..cc89fbb 100644
--- a/dockerfiles/debian
+++ b/dockerfiles/debian
@@ -3,51 +3,62 @@ FROM debian
 RUN apt update && apt upgrade -y && \
   DEBIAN_FRONTEND=noninteractive \
   apt install \
-    bind-utils \
+    acl \
+    attr \
+    autoconf \
+    bind9utils \
     bison \
-    dbus-devel \
-    docbook-style-xsl \
+    build-essential \
+    curl \
+    debhelper \
+    dnsutils \
+    docbook-xml \
+    docbook-xsl \
     flex \
-    gcc \
     gdb \
-    gnutls-devel \
-    gpgme-devel \
-    hostname \
-    iproute \
-    jansson-devel \
+    iproute2 \
+    iputils-ping \
     jq \
-    keyutils-libs-devel \
-    krb5-workstation \
-    libacl-devel \
-    libaio-devel \
-    libarchive-devel \
-    libattr-devel \
-    libblkid-devel \
-    libtasn1 \
-    libtasn1-tools \
-    libtirpc-devel \
-    libxml2-devel \
-    libxslt \
-    lmdb-devel \
-    netcat \
-    openldap-clients \
-    openldap-devel \
-    pam-devel \
+    krb5-user \
+    ldap-utils \
+    libacl1-dev \
+    libaio-dev \
+    libarchive-dev \
+    libattr1-dev \
+    libblkid-dev \
+    libbsd-dev \
+    libcap-dev \
+    libcups2-dev \
+    libdbus-1-dev \
+    libgnutls28-dev \
+    libgpgme-dev \
+    libjansson-dev \
+    libjson-perl \
+    libldap2-dev \
+    liblmdb-dev \
+    libncurses5-dev \
+    libpam0g-dev \
+    libparse-yapp-perl \
+    libpopt-dev \
+    libreadline-dev \
+    lmdb-utils \
+    netcat-traditional \
+    nettle-dev \
     perl \
-    perl-ExtUtils-MakeMaker \
-    perl-JSON \
-    perl-Parse-Yapp \
-    popt-devel \
+    perl-modules \
+    pkg-config \
+    python3-all-dev \
     python3-cryptography \
-    python3-devel \
-    python3-dns \
+    python3-dbg \
+    python3-dev \
+    python3-dev \
+    python3-dnspython \
+    python3-dnspython \
     python3-gpg \
     python3-markdown \
-    readline-devel \
-    rpcgen \
-    systemd-devel \
-    tar \
-    zlib-devel \
+    vim \
+    xsltproc \
+    zlib1g-dev \
   -y && apt clean autoclean && \
   apt autoremove -y
 
diff --git a/dockerfiles/ubuntu b/dockerfiles/ubuntu
index 852ad9e..fc7c845 100644
--- a/dockerfiles/ubuntu
+++ b/dockerfiles/ubuntu
@@ -3,51 +3,62 @@ FROM ubuntu
 RUN apt update && apt upgrade -y && \
   DEBIAN_FRONTEND=noninteractive \
   apt install \
-    bind-utils \
+    acl \
+    attr \
+    autoconf \
+    bind9utils \
     bison \
-    dbus-devel \
-    docbook-style-xsl \
+    build-essential \
+    curl \
+    debhelper \
+    dnsutils \
+    docbook-xml \
+    docbook-xsl \
     flex \
-    gcc \
     gdb \
-    gnutls-devel \
-    gpgme-devel \
-    hostname \
-    iproute \
-    jansson-devel \
+    iproute2 \
+    iputils-ping \
     jq \
-    keyutils-libs-devel \
-    krb5-workstation \
-    libacl-devel \
-    libaio-devel \
-    libarchive-devel \
-    libattr-devel \
-    libblkid-devel \
-    libtasn1 \
-    libtasn1-tools \
-    libtirpc-devel \
-    libxml2-devel \
-    libxslt \
-    lmdb-devel \
-    netcat \
-    openldap-clients \
-    openldap-devel \
-    pam-devel \
+    krb5-user \
+    ldap-utils \
+    libacl1-dev \
+    libaio-dev \
+    libarchive-dev \
+    libattr1-dev \
+    libblkid-dev \
+    libbsd-dev \
+    libcap-dev \
+    libcups2-dev \
+    libdbus-1-dev \
+    libgnutls28-dev \
+    libgpgme-dev \
+    libjansson-dev \
+    libjson-perl \
+    libldap2-dev \
+    liblmdb-dev \
+    libncurses5-dev \
+    libpam0g-dev \
+    libparse-yapp-perl \
+    libpopt-dev \
+    libreadline-dev \
+    lmdb-utils \
+    netcat-traditional \
+    nettle-dev \
     perl \
-    perl-ExtUtils-MakeMaker \
-    perl-JSON \
-    perl-Parse-Yapp \
-    popt-devel \
+    perl-modules \
+    pkg-config \
+    python3-all-dev \
     python3-cryptography \
-    python3-devel \
-    python3-dns \
+    python3-dbg \
+    python3-dev \
+    python3-dev \
+    python3-dnspython \
+    python3-dnspython \
     python3-gpg \
     python3-markdown \
-    readline-devel \
-    rpcgen \
-    systemd-devel \
-    tar \
-    zlib-devel \
+    vim \
+    xsltproc \
+    zlib1g-dev \
   -y && apt clean autoclean && \
   apt autoremove -y