diff --git a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2
index ae2ed8c1c8..fff8ca997a 100644
--- a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2
+++ b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2
@@ -3,7 +3,7 @@ Description=Mirrorlist Container {{ item }}
 
 [Service]
 User=mirrormanager
-ExecStartPre=-/usr/bin/podman stop %n
+ExecStartPre=-/usr/bin/podman stop -t 1 %n
 ExecStartPre=-/usr/bin/podman rm %n --force
 ExecStart=/usr/bin/podman run \
             --rm=true \
@@ -20,7 +20,8 @@ ExecStart=/usr/bin/podman run \
                  --port 1808{{ item }} \
                  --listen 127.0.0.1 \
                  -l /var/log/mirrormanager/%n.log
-ExecStop=/usr/bin/podman stop %n
+ExecStop=/usr/bin/podman stop -t 1 %n
+KillMode=none
 
 [Install]
 WantedBy=multi-user.target