diff --git a/roles/authentik/handlers/main.yml b/roles/authentik/handlers/main.yml
index 07c6c69..1ec8a95 100644
--- a/roles/authentik/handlers/main.yml
+++ b/roles/authentik/handlers/main.yml
@@ -6,6 +6,9 @@
 - name: Restart authentik
   service: name=authentik state=restarted
 
+- name: Restart authentik-reload
+  service: name=authentik-reload state=restarted
+
 - name: Restart nginx
   service: name=nginx state=restarted
 
diff --git a/roles/authentik/tasks/main.yml b/roles/authentik/tasks/main.yml
index 762fbc6..df7b6c8 100644
--- a/roles/authentik/tasks/main.yml
+++ b/roles/authentik/tasks/main.yml
@@ -37,15 +37,20 @@
   notify: Restart nginx
 
 - name: Systemd unit for authentik
-  template: src=authentik{{ item }}.j2 dest=/etc/systemd/system/authentik{{ item }}
-  with_items:
-  - ".service"
-  - "-reload.service"
-  - "-reload.timer"
+  template: src=authentik.service.j2 dest=/etc/systemd/system/authentik.service
   notify:
   - Reload systemd
   - Restart authentik
 
+- name: Systemd unit for authentik-reload
+  template: src=authentik-reload.{{ item }}.j2 dest=/etc/systemd/system/authentik-reload.{{ item }}
+  with_items:
+  - "service"
+  - "timer"
+  notify:
+  - Reload systemd
+  - Restart authentik-reload
+
 - name: Start the authentik service
   service: name=authentik state=started enabled=yes