diff --git a/unit-files/confd.service b/unit-files/confd.service
index d02f300ddc7fad70ed04dbc2e70ab83adcf03531..5afe2cbe5dbb45456e20e045b9e66e322cb58ae4 100644
--- a/unit-files/confd.service
+++ b/unit-files/confd.service
@@ -15,6 +15,7 @@ Restart=always
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
 ExecStart=/usr/bin/docker run \
+  --rm \
   --name %p \
   -v /data/runtime/haproxy/:/etc/haproxy/ \
   -v /var/run/docker.sock:/var/run/docker.sock \
diff --git a/unit-files/email-forwarder.service b/unit-files/email-forwarder.service
index b0bf3d3d08d8a83bc9cdf788ce87a434dbd0e06c..715e7f8488078bf41de07f3250184ae918948011 100644
--- a/unit-files/email-forwarder.service
+++ b/unit-files/email-forwarder.service
@@ -12,6 +12,7 @@ Restart=always
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
 ExecStart=/usr/bin/docker run \
+  --rm \
   --name %p \
   -v /data/runtime/postfix/:/data \
   -p 25:25 \
diff --git a/unit-files/haproxy.service b/unit-files/haproxy.service
index 3ffdd9f73526bb8ef715202a2f2dac38984f4bab..57d2d8e1ee0250acd8c77948daebae3729d3b448 100644
--- a/unit-files/haproxy.service
+++ b/unit-files/haproxy.service
@@ -12,6 +12,7 @@ Restart=always
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
 ExecStart=/usr/bin/docker run \
+  --rm \
   --name %p \
   -v /data/runtime/haproxy:/etc/haproxy \
   -p 80:80 \
diff --git a/unit-files/mysql@.service b/unit-files/mysql@.service
index 6a39d9f5e9f044fc2ceb564de6b0b747d40cf976..25ab989fdba043d8ab2a2e5ca1095b7b1d6ef5e6 100644
--- a/unit-files/mysql@.service
+++ b/unit-files/mysql@.service
@@ -33,6 +33,7 @@ ExecStartPre=/bin/bash -euxc ' \
   fi'
 
 ExecStart=/opt/bin/systemd-docker run \
+  --rm \
   --name %p-%i \
   -v /data/runtime/domains/%i/%p/db_files:/var/lib/mysql \
   -e STARTUP_SQL=/var/lib/mysql/dump.sql \