diff --git a/roles/archwiki/tasks/main.yml b/roles/archwiki/tasks/main.yml
index bf3eda1f0ec1b434377af09f91accb6e5db60c23..9a17f14b3afbe5025eeb8cf633ec4d273e39ea41 100644
--- a/roles/archwiki/tasks/main.yml
+++ b/roles/archwiki/tasks/main.yml
@@ -70,30 +70,16 @@
 - name: start and enable systemd socket
   service: name=php-fpm@{{ archwiki_user }}.socket state=started enabled=true
 
-- name: install runjobs service
-  template: src="archwiki-runjobs.service.j2" dest="/etc/systemd/system/archwiki-runjobs.service" owner=root group=root mode=0644
-  notify:
-    - daemon reload
-
-- name: install runjobs timer
-  template: src="archwiki-runjobs.timer.j2" dest="/etc/systemd/system/archwiki-runjobs.timer" owner=root group=root mode=0644
-  notify:
-    - daemon reload
-
-- name: install prune cache service
-  template: src="archwiki-prune-cache.service.j2" dest="/etc/systemd/system/archwiki-prune-cache.service" owner=root group=root mode=0644
-  notify:
-    - daemon reload
-
-- name: install prune cache timer
-  template: src="archwiki-prune-cache.timer.j2" dest="/etc/systemd/system/archwiki-prune-cache.timer" owner=root group=root mode=0644
-  notify:
-    - daemon reload
-
-- name: install runjobs wait service
-  template: src="archwiki-runjobs-wait.service.j2" dest="/etc/systemd/system/archwiki-runjobs-wait.service" owner=root group=root mode=0644
+- name: install systemd services/timers
+  template: src="{{item}}.j2" dest="/etc/systemd/system/{{item}}" owner=root group=root mode=0644
   notify:
     - daemon reload
+  loop:
+    - archwiki-runjobs.service
+    - archwiki-runjobs-wait.service
+    - archwiki-runjobs.timer
+    - archwiki-prune-cache.service
+    - archwiki-prune-cache.timer
 
 - name: start and enable archwiki runjobs timer
   service: name="archwiki-runjobs.timer" enabled=yes state=started