diff --git a/Dockerfile b/Dockerfile
index d1055bc..c810a77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,30 +6,24 @@ ENV DEBIAN_FRONTEND noninteractive
 
 # Configure Proxy
 RUN set -ex; \
-    sed -i 's/deb.debian.org/ftp.ch.debian.org/g' /etc/apt/sources.list && \
     apt-get update --allow-releaseinfo-change && \
     apt-get install -qy netcat-openbsd && \
-    sed -i 's/ftp.ch.debian.org/deb.debian.org/g' /etc/apt/sources.list || exit 0 && \
     if [ -z "$APT_CACHER" ]; then APT_CACHER="apt-cacher.apt-cacher.svc.cluster.local"; fi && \
     if nc -w1 -z $APT_CACHER 3142 1>/dev/null 2>&1; then \
     echo 'Acquire::HTTP::Proxy "http://'$APT_CACHER':3142";' >> /etc/apt/apt.conf.d/01proxy && \
     echo 'Acquire::HTTPS::Proxy "false";' >> /etc/apt/apt.conf.d/01proxy; else exit 0; fi
 
 RUN set -ex; \
-    apt-get update --allow-releaseinfo-change && \
     apt-get dist-upgrade -y -o 'DPkg::Options::=--force-confold' -o 'DPkg::Options::=--force-confdef' && \
     apt-get install --no-install-recommends -y -o 'DPkg::Options::=--force-confold' -o 'DPkg::Options::=--force-confdef' gnupg apt-transport-https curl ca-certificates && \
     curl https://repo.dovecot.org/DOVECOT-REPO-GPG | gpg --import && \
     gpg --export ED409DA1 > /etc/apt/trusted.gpg.d/dovecot.gpg && \
-    echo "deb https://repo.dovecot.org/ce-2.3-latest/debian/bullseye bullseye main" > /etc/apt/sources.list.d/dovecot.list
-
-RUN set -ex; \
+    echo "deb https://repo.dovecot.org/ce-2.3-latest/debian/bullseye bullseye main" > /etc/apt/sources.list.d/dovecot.list && \
     apt-get update --allow-releaseinfo-change && \
     apt-get install --no-install-recommends -y -o 'DPkg::Options::=--force-confold' -o 'DPkg::Options::=--force-confdef' dovecot-imapd dovecot-pop3d dovecot-lmtpd dovecot-managesieved dovecot-sieve dovecot-pgsql dovecot-mysql python3-minimal python3-jinja2
 
 # Install rspamc to submit SPAM/HAM to rspamd
 RUN set -ex; \
-    apt-get update --allow-releaseinfo-change && \
     apt-get install --no-install-recommends -y -o 'DPkg::Options::=--force-confold' -o 'DPkg::Options::=--force-confdef' lsb-release wget ca-certificates gpg && \
     mkdir -p /etc/apt/keyrings && \
     wget -O- https://rspamd.com/apt-stable/gpg.key | gpg --dearmor > /etc/apt/keyrings/rspamd.gpg && \
@@ -39,7 +33,10 @@ RUN set -ex; \
     apt-get --no-install-recommends -y -o 'DPkg::Options::=--force-confold' -o 'DPkg::Options::=--force-confdef' install rspamd && \
     rm -rf /var/lib/apt/lists/*
 
-RUN rm -f /etc/apt/apt.conf.d/01proxy
+# Remove proxy for future runs and lists for space
+RUN set -ex; \ 
+    rm -f /etc/apt/apt.conf.d/01proxy && \
+    rm -rf /var/lib/apt/lists/*
 
 COPY conf /conf
 COPY sieve /sieve