diff --git a/roles/gitea/handlers/main.yml b/roles/gitea/handlers/main.yml
index de828b8..46e8b95 100644
--- a/roles/gitea/handlers/main.yml
+++ b/roles/gitea/handlers/main.yml
@@ -2,35 +2,9 @@
 # vim:ft=ansible:
 ---
 - name: restart gitea
-  service:
+  systemd:
+    daemon_reload: yes
     name: gitea.service
     state: restarted
 - name: gitea add default user
-  block:
-    - name: Create user
-      command:
-        argv:
-          - /usr/local/bin/gitea
-          - admin
-          - create-user
-          - --username
-          - "{{ gitea_admin_username }}"
-          - --password
-          - "{{ gitea_admin_password }}"
-          - --email
-          - "{{ gitea_admin_email }}"
-          - --config
-          - /etc/gitea/app.ini
-    - name: Promote user to admin
-      command:
-        argv:
-          - /usr/bin/mysql
-          - gitea
-          - -u
-          - gitea
-          - -p
-          - "{{ gitea_mysql_password }}"
-          - -e
-          - 'UPDATE user SET is_admin = 1 WHERE name = {{ gitea_admin_username }};'
-  become: yes
-  become_user: git
+  import_tasks: tasks/add_default_user.yml
diff --git a/roles/gitea/tasks/add_default_user.yml b/roles/gitea/tasks/add_default_user.yml
new file mode 100644
index 0000000..0cdc2fb
--- /dev/null
+++ b/roles/gitea/tasks/add_default_user.yml
@@ -0,0 +1,33 @@
+
+#!/usr/bin/ansible-playbook
+# vim:ft=ansible:
+---
+- name: Create user
+  command:
+    argv:
+      - /usr/local/bin/gitea
+      - admin
+      - create-user
+      - --username
+      - "{{ gitea_admin_username }}"
+      - --password
+      - "{{ gitea_admin_password }}"
+      - --email
+      - "{{ gitea_admin_email }}"
+      - --config
+      - /etc/gitea/app.ini
+  become: yes
+  become_user: git
+- name: Promote user to admin
+  command:
+    argv:
+      - /usr/bin/mysql
+      - gitea
+      - -u
+      - gitea
+      - -p
+      - "{{ gitea_mysql_password }}"
+      - -e
+      - 'UPDATE user SET is_admin = 1 WHERE name = {{ gitea_admin_username }};'
+  become: yes
+  become_user: git
diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml
index d3388ff..77b4c57 100644
--- a/roles/gitea/tasks/main.yml
+++ b/roles/gitea/tasks/main.yml
@@ -108,7 +108,8 @@
         dest: "/etc/systemd/system/gitea.service"
       notify: restart gitea
     - name: Start and enable service
-      service:
+      systemd:
+        daemon_reload: yes
         name: "gitea.service"
         enabled: yes
         state: "started"