diff --git a/dockerfiles/focal.docker b/dockerfiles/focal.docker
index 7355fb06cd801f306e602984496de6c63f1f3382..3ae91590cc93e312d68f0936e2e05248e6dcf9f5 100644
--- a/dockerfiles/focal.docker
+++ b/dockerfiles/focal.docker
@@ -1,6 +1,6 @@
 FROM ubuntu:focal
-ENV http_proxy http://xfelproxy.desy.de:3128
-ENV https_proxy http://xfelproxy.desy.de:3128
+ENV http_proxy ${http_proxy}
+ENV https_proxy ${https_proxy}
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
@@ -10,7 +10,7 @@ RUN apt-get update && \
     apt-get update && \
     apt-get upgrade -y && \
     apt-get dist-upgrade -y && \
-    apt-get install -y sudo wget python3-pip locales pigz \ 
+    apt-get install -y sudo wget python3-pip locales pigz \
         g++ valgrind cppcheck lcov doxygen procmail make git gdb cmake ninja-build \
         libboost-all-dev libxml++2.6-dev \
         libldap2-dev libzmq3-dev rpcbind \
@@ -42,15 +42,8 @@ RUN apt-get update && \
     ln -sfn /usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3 && \
     pip3 install meson
 
-RUN echo "Defaults set_home" >> /etc/sudoers && \
-    echo 'Acquire::http::proxy "http://xfelproxy.desy.de:3128/";' > /etc/apt/apt.conf && \
-    echo 'http_proxy=http://xfelproxy.desy.de:3128' >> /etc/environment && \
-    echo 'https_proxy=https://xfelproxy.desy.de:3128' >> /etc/environment && \
-    git config --system http.proxy http://xfelproxy.desy.de:3128 && \
-    git config --system https.proxy http://xfelproxy.desy.de:3128
-   
 # NOTE: This last line (symlink for libzmq.so.3) is a hack for a bug in DOOCS serverlib, which has the version number hardcoded.
-   
+
 ADD lcov-to-cobertura-xml /common/lcov_cobertura-1.6
 
 # Start rpcbind at launch of the container, required for DOOCS
diff --git a/dockerfiles/tumbleweed.docker b/dockerfiles/tumbleweed.docker
index fccfde293593f53ea1bbb6d7df96f7d058950d3d..145d03285f0756903ec30946a66d929ce529fdbc 100644
--- a/dockerfiles/tumbleweed.docker
+++ b/dockerfiles/tumbleweed.docker
@@ -1,6 +1,6 @@
 FROM opensuse/tumbleweed:latest
-ENV http_proxy http://xfelproxy.desy.de:3128
-ENV https_proxy http://xfelproxy.desy.de:3128
+ENV http_proxy ${http_proxy}
+ENV https_proxy ${https_proxy}
 
 RUN zypper refresh && \
     zypper up -y && \