diff --git a/roles/server/gitea/handlers/main.yml b/roles/server/gitea/handlers/main.yml
new file mode 100644
index 0000000..5135cba
--- /dev/null
+++ b/roles/server/gitea/handlers/main.yml
@@ -0,0 +1,7 @@
+---
+
+- name: restart gitea
+  systemd:
+    state: restarted
+    name: "{{ gitea_service_name }}"
+    enabled: yes
diff --git a/roles/server/gitea/meta/main.yml b/roles/server/gitea/meta/main.yml
index c3dc505..5d4727d 100644
--- a/roles/server/gitea/meta/main.yml
+++ b/roles/server/gitea/meta/main.yml
@@ -1,6 +1,7 @@
 ---
 
 dependencies:
+  - role: misc/handlers
   - role: mysql/database
     # database_user
   - role: nginx/proxy
diff --git a/roles/server/gitea/tasks/main.yml b/roles/server/gitea/tasks/main.yml
index cf3699d..d7be82b 100644
--- a/roles/server/gitea/tasks/main.yml
+++ b/roles/server/gitea/tasks/main.yml
@@ -55,7 +55,7 @@
     mode: 0640
     owner: root
     group: "{{ gitea_system_user }}"
-  register: gitea_configure
+  notify: restart gitea
 
 - name: Install auto update script for gitea
   template:
@@ -70,22 +70,15 @@
   args:
     chdir: "{{ gitea_installation_directory }}"
     creates: "{{ gitea_binary_path }}"
-  register: gitea_binary_download
+  notify: restart gitea
 
 - name: Register service for gitea
   template:
     src: "gitea.service"
     dest: "/etc/systemd/system/{{ gitea_service_name }}"
-  register: gitea_register_service
-
-# TODO Change to handler
-- name: Enable service for gitea
-  systemd:
-    daemon_reload: yes
-    enabled: yes
-    name: "{{ gitea_service_name }}"
-    state: restarted
-  when: gitea_configure.changed or gitea_binary_download.changed or gitea_register_service.changed
+  notify:
+    - reload systemd
+    - restart gitea
 
 - name: Enable auto update of gitea
   cron: