diff --git a/roles/archwiki/tasks/main.yml b/roles/archwiki/tasks/main.yml
index ae996ecb..4d25d14e 100644
--- a/roles/archwiki/tasks/main.yml
+++ b/roles/archwiki/tasks/main.yml
@@ -96,7 +96,7 @@
   template: src="memcached.service.d-archwiki.conf.j2" dest="/etc/systemd/system/memcached@archwiki.service.d/archwiki.conf" owner=root group=root mode=0644
 
 - name: Start and enable memcached service
-  service: name=memcached@archwiki.service state=started enabled=true daemon_reload=true
+  systemd: name=memcached@archwiki.service state=started enabled=true daemon_reload=true
 
 - name: Install systemd services/timers
   template: src="{{ item }}.j2" dest="/etc/systemd/system/{{ item }}" owner=root group=root mode=0644
diff --git a/roles/aurweb/tasks/main.yml b/roles/aurweb/tasks/main.yml
index 4426422d..bbb0de43 100644
--- a/roles/aurweb/tasks/main.yml
+++ b/roles/aurweb/tasks/main.yml
@@ -320,7 +320,7 @@
     - Restart sshd
 
 - name: Start and enable AUR systemd services and timers
-  service: name={{ item }} enabled=yes state=started daemon_reload=yes
+  systemd: name={{ item }} enabled=yes state=started daemon_reload=yes
   with_items:
     - aurweb-git.timer
     - aurweb-git-archive.timer
diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml
index 736c5e51..de2412cc 100644
--- a/roles/common/handlers/main.yml
+++ b/roles/common/handlers/main.yml
@@ -9,4 +9,4 @@
     daemon_reload: true
 
 - name: Restart systemd-zram-setup@zram0
-  service: name=systemd-zram-setup@zram0 state=restarted daemon_reload=yes
+  systemd: name=systemd-zram-setup@zram0 state=restarted daemon_reload=yes
diff --git a/roles/gitlab_runner/handlers/main.yml b/roles/gitlab_runner/handlers/main.yml
index 94bed04c..83359333 100644
--- a/roles/gitlab_runner/handlers/main.yml
+++ b/roles/gitlab_runner/handlers/main.yml
@@ -5,7 +5,7 @@
   service: name=gitlab-runner state=restarted
 
 - name: Restart gitlab-runner-docker-cleanup.timer
-  service: name=gitlab-runner-docker-cleanup.timer state=restarted daemon_reload=yes
+  systemd: name=gitlab-runner-docker-cleanup.timer state=restarted daemon_reload=yes
 
 - name: Restart docker
   service: name=docker state=restarted
diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml
index 910218ad..bfdd8dc3 100644
--- a/roles/keycloak/tasks/main.yml
+++ b/roles/keycloak/tasks/main.yml
@@ -37,7 +37,7 @@
       no_log: true
 
     - name: Start and enable keycloak
-      service: name=keycloak enabled=yes daemon_reload=yes state=started
+      systemd: name=keycloak enabled=yes daemon_reload=yes state=started
 
     - name: Wait for keycloak to initialize
       wait_for: port={{ keycloak_port }}
diff --git a/roles/networking/tasks/main.yml b/roles/networking/tasks/main.yml
index 9769193d..7a0cf770 100644
--- a/roles/networking/tasks/main.yml
+++ b/roles/networking/tasks/main.yml
@@ -52,7 +52,7 @@
     - "'hcloud' in group_names or inventory_hostname == 'packer-base-image'"
 
 - name: Start and enable hcloud-init
-  service: name=hcloud-init daemon_reload=yes state=started enabled=yes
+  systemd: name=hcloud-init daemon_reload=yes state=started enabled=yes
   when:
     - chroot_path | length == 0
     - "'hcloud' in group_names or inventory_hostname == 'packer-base-image'"
diff --git a/roles/promtail/handlers/main.yml b/roles/promtail/handlers/main.yml
index cb1e2339..7049090a 100644
--- a/roles/promtail/handlers/main.yml
+++ b/roles/promtail/handlers/main.yml
@@ -1,2 +1,2 @@
 - name: Restart promtail
-  service: name=promtail daemon_reload=yes state=restarted
+  systemd: name=promtail daemon_reload=yes state=restarted