diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index 3a4459f4..a0069aac 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -1,25 +1,25 @@
-FROM fedora:34
+FROM fedora:35
 
 MAINTAINER Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
 
 ENV container docker
 
 RUN dnf -y install \
         --setopt 'tsflags=nodocs' \
         nginx \
         nginx-mod-mail && \
     dnf clean all
 
 COPY nginx.conf /etc/nginx/nginx.conf
 ARG APP_WEBSITE_DOMAIN
 RUN sed -i -r -e "s|^.*auth_http_header.*$|    auth_http_header    Host services.$APP_WEBSITE_DOMAIN;|g" /etc/nginx/nginx.conf
 
 # Forward request logs to Docker log collector
 RUN ln -sf /dev/stdout /var/log/nginx/access.log \
     && ln -sf /dev/stderr /var/log/nginx/error.log
 
 STOPSIGNAL SIGTERM
 
 CMD ["nginx", "-g", "daemon off;"]
 
 EXPOSE 110/tcp 143/tcp 993/tcp 995/tcp
diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile
index 592e1e2a..61281386 100644
--- a/docker/proxy/Dockerfile
+++ b/docker/proxy/Dockerfile
@@ -1,46 +1,46 @@
-FROM fedora:31
+FROM fedora:35
 
 MAINTAINER Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
 
 ENV container docker
 ENV SYSTEMD_PAGER=''
 
 RUN dnf -y install \
         --setopt 'tsflags=nodocs' \
         bash-completion \
         bind-utils \
         certbot \
         curl \
         dhcp-client \
         git \
         iproute \
         iptraf-ng \
         iputils \
         less \
         lsof \
         mtr \
         net-tools \
         NetworkManager \
         NetworkManager-tui \
         network-scripts \
         nginx \
         nmap-ncat \
         openssh-clients \
         openssh-server \
         procps-ng \
         python3-certbot-nginx \
         strace \
         systemd-udev \
         tcpdump \
         telnet \
         traceroute \
         vim-enhanced \
         wget && \
     dnf clean all
 
 COPY rootfs/ /
 
 RUN systemctl enable nginx
 
 CMD ["/lib/systemd/systemd", "--system"]
 ENTRYPOINT "/lib/systemd/systemd"