diff --git a/Dockerfile b/Dockerfile
index 4813236c..bd2b51c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,6 @@ ENV POSTGREY_MAX_AGE=35
 ENV POSTGREY_TEXT="Delayed by Postgrey"
 ENV SASLAUTHD_MECHANISMS=pam
 ENV SASLAUTHD_MECH_OPTIONS=""
-ENV VIRUSMAILS_DELETE_DELAY=7
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/target/bin/virus-wiper b/target/bin/virus-wiper
index 2c6c9762..4790c668 100755
--- a/target/bin/virus-wiper
+++ b/target/bin/virus-wiper
@@ -1,3 +1,8 @@
 #! /bin/bash
 
+set -e
+
+# shellcheck source=/dev/null
+. /etc/dms-settings
+
 find /var/lib/amavis/virusmails/ -type f -mtime +"${VIRUSMAILS_DELETE_DELAY}" -delete
diff --git a/target/scripts/start-mailserver.sh b/target/scripts/start-mailserver.sh
index cc15a5e7..3d97106d 100755
--- a/target/scripts/start-mailserver.sh
+++ b/target/scripts/start-mailserver.sh
@@ -140,7 +140,6 @@ function register_functions
   [[ ${ENABLE_POSTFIX_VIRTUAL_TRANSPORT:-0} -eq 1 ]] && _register_setup_function '_setup_postfix_virtual_transport'
 
   _register_setup_function '_setup_postfix_override_configuration'
-  _register_setup_function '_setup_environment'
   _register_setup_function '_setup_logrotate'
   _register_setup_function '_setup_mail_summary'
   _register_setup_function '_setup_logwatch'
diff --git a/target/scripts/startup/setup-stack.sh b/target/scripts/startup/setup-stack.sh
index adb9dd1a..0d2703af 100644
--- a/target/scripts/startup/setup-stack.sh
+++ b/target/scripts/startup/setup-stack.sh
@@ -1720,17 +1720,6 @@ function _setup_user_patches
   fi
 }
 
-function _setup_environment
-{
-  _notify 'task' 'Setting up /etc/environment'
-
-  if ! grep -q "# Docker Mail Server" /etc/environment
-  then
-    echo "# Docker Mail Server" >>/etc/environment
-    echo "VIRUSMAILS_DELETE_DELAY=${VIRUSMAILS_DELETE_DELAY}" >>/etc/environment
-  fi
-}
-
 function _setup_fail2ban
 {
   _notify 'task' 'Setting up fail2ban'