diff --git a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
index 63596ee4ae..f19a5a4105 100644
--- a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
+++ b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
@@ -59,7 +59,6 @@
   - /var/log/mirrormanager
   tags:
   - mirrorlist_proxy
-  when: env == 'staging' or inventory_hostname.startswith('proxy14')
 
 - name: set logrotate_read_inside_containers so logrotate works
   seboolean: name=logrotate_read_inside_containers state=yes persistent=yes
diff --git a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2
index 2d26807c80..3ffe1e4d0c 100644
--- a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2
+++ b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2
@@ -2,12 +2,9 @@
 Description=Mirrorlist Container {{ item }}
 
 [Service]
-{% if env == "staging" or inventory_hostname == "proxy14.fedoraproject.org" %}
 User=mirrormanager
-{% endif %}
 ExecStartPre=-/usr/bin/podman stop %n
 ExecStartPre=-/usr/bin/podman rm %n --force
-{% if env == "staging" or inventory_hostname == "proxy14.fedoraproject.org" %}
 ExecStart=/usr/bin/podman run \
             --rm=true \
             --net=host --userns=keep-id \
@@ -19,9 +16,6 @@ ExecStart=/usr/bin/podman run \
                  --port 1808{{ item }} \
                  --listen 127.0.0.1 \
                  -l /var/log/mirrormanager/%n.log
-{% else %}
-ExecStart=/usr/bin/podman run --rm=true --name %n -v /srv/mirrorlist/data/mirrorlist{{ item }}:/var/lib/mirrormanager:z -v /var/log/mirrormanager:/var/log/mirrormanager:z -p 1808{{ item }}:80 {{ mirrorlist_container_image }} -l /var/log/mirrormanager/%n.log
-{% endif %}
 ExecStop=/usr/bin/podman stop %n
 
 [Install]