diff --git a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service b/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service
index 74a8425c71..4f4216716c 100644
--- a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service
+++ b/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service
@@ -5,9 +5,10 @@ Requires=docker.service
 
 [Service]
 TimeoutStartSec=0
-ExecStart=/usr/bin/docker run --rm --name %n -v /srv/mirrorlist/data/mirrorlist1:/var/lib/mirrormanager:z -v /var/log/mirrormanager:/var/log/mirrormanager:z -p 18081:80 candidate-registry.fedoraproject.org/f25/mirrormanager2-mirrorlist:0.7.3-1 -l /var/log/mirrormanager/%n.log
-ExecStop=/usr/bin/docker stop %n
-ExecStop=/usr/bin/docker rm %n
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/docker run --detach --name %n -v /srv/mirrorlist/data/mirrorlist1:/var/lib/mirrormanager:z -v /var/log/mirrormanager:/var/log/mirrormanager:z -p 18081:80 candidate-registry.fedoraproject.org/f25/mirrormanager2-mirrorlist:0.7.3-1 -l /var/log/mirrormanager/%n.log
+ExecStop=/usr/bin/docker rm --force %n
 
 [Install]
 WantedBy=multi-user.target
diff --git a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service b/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service
index 35ce1c2c57..6dcab5c114 100644
--- a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service
+++ b/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service
@@ -5,9 +5,10 @@ Requires=docker.service
 
 [Service]
 TimeoutStartSec=0
-ExecStart=/usr/bin/docker run --rm --name %n -v /srv/mirrorlist/data/mirrorlist2:/var/lib/mirrormanager:z -v /var/log/mirrormanager:/var/log/mirrormanager:z -p 18082:80 candidate-registry.fedoraproject.org/f25/mirrormanager2-mirrorlist:0.7.3-1 -l /var/log/mirrormanager/%n.log
-ExecStop=/usr/bin/docker stop %n
-ExecStop=/usr/bin/docker rm %n
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/docker run --detach --name %n -v /srv/mirrorlist/data/mirrorlist2:/var/lib/mirrormanager:z -v /var/log/mirrormanager:/var/log/mirrormanager:z -p 18082:80 candidate-registry.fedoraproject.org/f25/mirrormanager2-mirrorlist:0.7.3-1 -l /var/log/mirrormanager/%n.log
+ExecStop=/usr/bin/docker rm --force %n
 
 [Install]
 WantedBy=multi-user.target