diff --git a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service b/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service
index 389702fcb5..cd0fdd376e 100644
--- a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service
+++ b/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service
@@ -7,6 +7,7 @@ Requires=docker.service
 TimeoutStartSec=0
 ExecStart=/usr/bin/docker run --rm --name %n -v /srv/mirrorlist/data:/var/lib/mirrormanager:z -v /var/log/mirrormanager1:/var/log/mirrormanager:z -p 18081:80 candidate-registry.fedoraproject.org/f25/mirrormanager2-mirrorlist:f25-docker-candidate-20170206221219
 ExecStop=/usr/bin/docker stop %n
+ExecStop=/usr/bin/docker rm %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 e6733f067d..4a324803a8 100644
--- a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service
+++ b/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service
@@ -7,6 +7,7 @@ Requires=docker.service
 TimeoutStartSec=0
 ExecStart=/usr/bin/docker run --rm --name %n -v /srv/mirrorlist/data:/var/lib/mirrormanager:z -v /var/log/mirrormanager2:/var/log/mirrormanager:z -p 18082:80 candidate-registry.fedoraproject.org/f25/mirrormanager2-mirrorlist:f25-docker-candidate-20170206221219
 ExecStop=/usr/bin/docker stop %n
+ExecStop=/usr/bin/docker rm %n
 
 [Install]
 WantedBy=multi-user.target