diff --git a/roles/mirrormanager/mirrorlist_proxy/defaults/main.yml b/roles/mirrormanager/mirrorlist_proxy/defaults/main.yml
new file mode 100644
index 0000000000..17dd451fdd
--- /dev/null
+++ b/roles/mirrormanager/mirrorlist_proxy/defaults/main.yml
@@ -0,0 +1 @@
+mirrorlist_container_image: "candidate-registry.fedoraproject.org/f25/mirrormanager2-mirrorlist:0.7.3-2"
diff --git a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service b/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service
deleted file mode 100644
index 14b31e7555..0000000000
--- a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist2.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Mirrorlist Container 2
-After=docker.service
-Requires=docker.service
-
-[Service]
-TimeoutStartSec=0
-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-2 -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/tasks/main.yml b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
index 25bb2b9ed3..0e0873ae7e 100644
--- a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
+++ b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
@@ -51,7 +51,7 @@
 
 - name: Pull mirrorlist image
   docker_image:
-    name: candidate-registry.fedoraproject.org/f25/mirrormanager2-mirrorlist:0.7.3-1
+    name: "{{ mirrorlist_container_image }}"
     tls_verify: true
   tags:
   - mirrorlist_proxy
@@ -59,10 +59,10 @@
 # We deploy two service files. Both listen on a different port, so that we can switch
 # them out as part of the pkl deployment without having any local downtime.
 - name: Deploy service files
-  copy: src={{item}}.service dest=/etc/systemd/system/{{item}}.service
+  template: src=mirrorlist.service.j2 dest=/etc/systemd/system/mirrorlist{{ item }}.service
   with_items:
-  - mirrorlist1
-  - mirrorlist2
+  - 1
+  - 2
   tags:
   - mirrorlist_proxy
   notify:
diff --git a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2
similarity index 50%
rename from roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service
rename to roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2
index 1e35897f73..1d9eefc357 100644
--- a/roles/mirrormanager/mirrorlist_proxy/files/mirrorlist1.service
+++ b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2
@@ -1,5 +1,5 @@
 [Unit]
-Description=Mirrorlist Container 1
+Description=Mirrorlist Container {{ item }}
 After=docker.service
 Requires=docker.service
 
@@ -7,7 +7,7 @@ Requires=docker.service
 TimeoutStartSec=0
 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-2 -l /var/log/mirrormanager/%n.log
+ExecStart=/usr/bin/docker run --detach --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
 ExecStop=/usr/bin/docker rm --force %n
 
 [Install]