diff --git a/tasks/configure.yml b/tasks/configure.yml
index 97cf99d..cfac03f 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -1,31 +1,29 @@
 ---
-- name: kuma | Setup kuma
-  command: npm run setup
-  args:
-    chdir: "{{ kuma__path }}"
-  become_user: "{{ kuma__user }}"
+- block:
+  - name: uptime_kuma | configure | Setup kuma
+    command: npm run setup
+    args:
+      chdir: "{{ kuma__path }}"
 
-- name: kuma | Clear all pm2 apps
-  command: pm2 delete all
-  args:
-    chdir: "{{ kuma__path }}"
-  become_user: "{{ kuma__user }}"
+  - name: uptime_kuma | configure | Clear all pm2 apps
+    command: pm2 delete all
+    args:
+      chdir: "{{ kuma__path }}"
 
-- name: kuma | Create systemd startup script
-  command: env PATH=$PATH:/usr/bin /usr/lib/node_modules/pm2/bin/pm2 startup systemd -u {{ kuma__user }} --hp /home/{{ kuma__user }}
-  args:
-    chdir: "{{ kuma__path }}"
-  become: yes
-  become_user: "{{ kuma__user }}"
+  - name: uptime_kuma | configure | Create systemd startup script
+    command: env PATH=$PATH:/usr/bin /usr/lib/node_modules/pm2/bin/pm2 startup systemd -u {{ kuma__user }} --hp /home/{{ kuma__user }}
+    args:
+      chdir: "{{ kuma__path }}"
+    become: yes
 
-- name: kuma | Start kuma
-  command: pm2 start server/server.js --name kuma
-  args:
-    chdir: "{{ kuma__path }}"
-  become_user: "{{ kuma__user }}"
+  - name: uptime_kuma | configure | Start kuma
+    command: pm2 start server/server.js --name kuma
+    args:
+      chdir: "{{ kuma__path }}"
 
-- name: kuma | Ensure pm2 startup configuration is enabled for reboots.
-  command: pm2 save
-  args:
-    chdir: "{{ kuma__path }}"
-  become_user: "{{ kuma__user }}"
\ No newline at end of file
+  - name: uptime_kuma | configure | Ensure pm2 startup configuration is enabled for reboots.
+    command: pm2 save
+    args:
+      chdir: "{{ kuma__path }}"
+  become_user: "{{ kuma__user }}"
+  become: yes
\ No newline at end of file
diff --git a/tasks/dependencies.yml b/tasks/dependencies.yml
index 47f8409..4d8e6d7 100644
--- a/tasks/dependencies.yml
+++ b/tasks/dependencies.yml
@@ -10,30 +10,30 @@
   become: yes
 
 - block:
-  - name: uptime_kuma | nodejs | add NodeSource apt key
+  - name: uptime_kuma | dependencies | nodejs | add NodeSource apt key
     apt_key:
       url: "https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
       state: present
     become: yes
-    
-  - name: uptime_kuma | nodejs | Add NodeSource repository
+
+  - name: uptime_kuma | dependencies | nodejs | Add NodeSource repository
     apt_repository:
       repo: deb https://deb.nodesource.com/node_{{ nodejs__version }} {{ ansible_distribution_release }} main
       state: present
       filename: 'nodesource'
     become: yes
-    
-  - name: uptime_kuma | nodejs | Add NodeSource src repository
+
+  - name: uptime_kuma | dependencies | nodejs | Add NodeSource src repository
     apt_repository:
       repo: deb-src https://deb.nodesource.com/node_{{ nodejs__version }} {{ ansible_distribution_release }} main
       state: present
       filename: 'nodesource'
     become: yes
 
-  - name: uptime_kuma | nodejs | Install NodeJS
+  - name: uptime_kuma | dependencies | nodejs | Install NodeJS
     apt:
       name: nodejs
       state: latest
       update-cache: yes
     become: yes
-  when: kuma__install_nodejs == true
\ No newline at end of file
+  when: kuma__install_nodejs | bool
\ No newline at end of file
diff --git a/tasks/install.yml b/tasks/install.yml
index 6d01e0d..66dd8eb 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,10 +1,10 @@
 ---
-- name: uptime_kuma | add_user | Ensure kuma group exists
+- name: uptime_kuma | install | add_user | Ensure kuma group exists
   group:
     name: "{{ kuma__group }}"
     state: present
 
-- name: uptime_kuma | add_user | Add kuma user
+- name: uptime_kuma | install | add_user | Add kuma user
   user:
     name: "{{ kuma__user }}"
     group: "{{ kuma__group }}"
@@ -13,7 +13,7 @@
     shell: /bin/bash
   become: yes
 
-- name: kuma | Clone kuma repo
+- name: uptime_kuma | install | Clone kuma repo
   git:
     repo: "{{ kuma__repo }}"
     dest: "{{ kuma__path }}"
@@ -21,13 +21,14 @@
     group: "{{ kuma__group }}"
   become: yes
 
-- name: kuma | Install package dependencies
+- name: uptime_kuma | install | Install package dependencies
   npm:
     path: "{{ kuma__path }}"
     state: present
+  become: yes
   become_user: "{{ kuma__user }}"
 
-- name: kuma | Install pm2
+- name: uptime_kuma | install | Install pm2
   npm:
     name: pm2
     state: present