diff --git a/setup-forgejo.yml b/setup-forgejo.yml
index 1495d47..30e1aab 100644
--- a/setup-forgejo.yml
+++ b/setup-forgejo.yml
@@ -59,16 +59,21 @@
         src: files/forgejo.service
         dest: /etc/systemd/system/forgejo.service
       notify:
+        - Reload service files
         - Restart Forgejo
 
-    - name: Start Forgejo service
+    - name: Enable Forgejo service
       systemd_service:
         name: forgejo
+        enabled: true
         state: started
 
   handlers:
+    - name: Reload service files
+      systemd_service:
+        daemon_reload: true
+
     - name: Restart Forgejo
       systemd_service:
         name: forgejo
         state: restarted
-        daemon_reload: true # For the case where the service file changes!