diff --git a/docker/haproxy/Dockerfile b/docker/haproxy/Dockerfile
index 0c6b0196..b7d9de14 100644
--- a/docker/haproxy/Dockerfile
+++ b/docker/haproxy/Dockerfile
@@ -1,18 +1,14 @@
-FROM fedora:35
-
-MAINTAINER Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
-
-ENV container docker
+FROM apheleia/almalinux9
 
 RUN dnf -y install \
         --setopt 'tsflags=nodocs' \
         haproxy && \
     dnf clean all
 
 COPY haproxy.cfg /etc/haproxy/haproxy.cfg
 
 STOPSIGNAL SIGUSR1
 
 CMD ["haproxy", "-d", "-db", "-W", "-f", "/etc/haproxy/haproxy.cfg"]
 
 #EXPOSE 110/tcp 143/tcp 993/tcp 995/tcp
diff --git a/docker/pdns/Dockerfile b/docker/pdns/Dockerfile
index b72dc4a7..c03f5bde 100644
--- a/docker/pdns/Dockerfile
+++ b/docker/pdns/Dockerfile
@@ -1,29 +1,22 @@
-FROM fedora:35
-
-ENV container docker
-ENV SYSTEMD_PAGER=''
+FROM apheleia/almalinux9
 
 RUN dnf -y install \
     --setopt 'tsflags=nodocs' \
-    bind-utils \
     iproute \
     iptables \
     iputils \
     net-tools \
     pdns \
     pdns-backend-mysql \
     pdns-recursor \
     pdns-tools \
-    procps-ng \
-    vim-enhanced \
-    wget \
     which && \
     dnf clean all
 
 COPY pdns.conf /etc/pdns/pdns.conf
 COPY recursor.conf /etc/pdns-recursor/recursor.conf
 COPY init.sh /init.sh
 
 CMD ["/init.sh"]
 
 EXPOSE 53 53/udp