diff --git a/.prettierrc.yml b/.prettierrc.yml
deleted file mode 100644
index 0cb31e6..0000000
--- a/.prettierrc.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-singleQuote: true
-printWidth: 90
-tabWidth: 2
-useTabs: false
-bracketSpacing: true
diff --git a/ansible.cfg b/ansible.cfg
index d3d000d..da825e5 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -1,5 +1,4 @@
 [defaults]
-roles_path = ./roles
 ask_vault_pass = True
 
 [privilege_escalation]
diff --git a/handlers.yml b/handlers.yml
index 16f8612..214addc 100644
--- a/handlers.yml
+++ b/handlers.yml
@@ -12,9 +12,19 @@
     state: restarted
     enabled: true
 
-- name: regenerate initramfs
+- name: restart nftables
   become: true
-  command: update-initramfs -u -k all
+  systemd:
+    name: nftables.service
+    state: restarted
+    enabled: true
+
+- name: restart ssh
+  become: true
+  systemd:
+    name: ssh.service
+    state: restarted
+    enabled: true
 
 - name: restart docker service
   become: true
@@ -23,6 +33,17 @@
     state: restarted
     enabled: true
 
+- name: restart nginx
+  become: true
+  systemd:
+    name: nginx.service
+    state: restarted
+    enabled: true
+
+- name: regenerate initramfs
+  become: true
+  command: update-initramfs -u -k all
+
 - name: restart certbot
   become: true
   systemd:
@@ -33,4 +54,4 @@
 - name: Compile wezterm terminfo file
   become: true
   when: wezterm_copy.changed
-  ansible.builtin.command: 'tic -x {{ ansible_env.HOME }}/.terminfo'
+  ansible.builtin.command: tic -x /home/sonny/.terminfo
diff --git a/vars/jellyfin.yml b/host_vars/fudiggity/jellyfin.yml
similarity index 100%
rename from vars/jellyfin.yml
rename to host_vars/fudiggity/jellyfin.yml
diff --git a/vars/main.yml b/host_vars/fudiggity/main.yml
similarity index 100%
rename from vars/main.yml
rename to host_vars/fudiggity/main.yml
diff --git a/vars/mpd.yml b/host_vars/fudiggity/mpd.yml
similarity index 100%
rename from vars/mpd.yml
rename to host_vars/fudiggity/mpd.yml
diff --git a/vars/network.yml b/host_vars/fudiggity/network.yml
similarity index 100%
rename from vars/network.yml
rename to host_vars/fudiggity/network.yml
diff --git a/vars/radicale.yml b/host_vars/fudiggity/radicale.yml
similarity index 100%
rename from vars/radicale.yml
rename to host_vars/fudiggity/radicale.yml
diff --git a/vars/syncthing.yml b/host_vars/fudiggity/syncthing.yml
similarity index 88%
rename from vars/syncthing.yml
rename to host_vars/fudiggity/syncthing.yml
index 9a77ec7..4816b55 100644
--- a/vars/syncthing.yml
+++ b/host_vars/fudiggity/syncthing.yml
@@ -25,8 +25,8 @@ syncthing_devices:
 syncthing_folders:
   - id: default
     label: Default
-    path: '/var/syncthing/default'
-    source_path: '{{ ansible_env.HOME }}/files/sync/'
+    path: /var/syncthing/default
+    source_path: /home/sonny/files/sync/
     type: sendreceive
     devices:
       - *syncthing_desktop_id
@@ -35,8 +35,8 @@ syncthing_folders:
 
   - id: pictures
     label: Pictures
-    path: '/var/syncthing/pictures'
-    source_path: '{{ ansible_env.HOME }}/files/pictures/'
+    path: /var/syncthing/pictures
+    source_path: /home/sonny/files/pictures/
     type: sendreceive
     devices:
       - *syncthing_desktop_id
diff --git a/vars/transmission.yml b/host_vars/fudiggity/transmission.yml
similarity index 100%
rename from vars/transmission.yml
rename to host_vars/fudiggity/transmission.yml
diff --git a/vars/vpn.yml b/host_vars/fudiggity/vpn.yml
similarity index 100%
rename from vars/vpn.yml
rename to host_vars/fudiggity/vpn.yml
diff --git a/vars/vpn_media.yml b/host_vars/fudiggity/vpn_media.yml
similarity index 100%
rename from vars/vpn_media.yml
rename to host_vars/fudiggity/vpn_media.yml
diff --git a/playbook.yml b/playbook.yml
index 2d64e94..f65dbe3 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -5,8 +5,6 @@
       become: true
       ansible.builtin.apt:
         name: '{{ packages }}'
-  roles:
-    - common
   tasks:
     - name: Generic provisioning
       ansible.builtin.import_tasks: 'tasks/setup.yml'
@@ -55,13 +53,3 @@
   handlers:
     - name: Import handlers
       ansible.builtin.import_tasks: 'handlers.yml'
-  vars_files:
-    - 'vars/main.yml'
-    - 'vars/vpn.yml'
-    - 'vars/vpn_media.yml'
-    - 'vars/network.yml'
-    - 'vars/transmission.yml'
-    - 'vars/syncthing.yml'
-    - 'vars/mpd.yml'
-    - 'vars/radicale.yml'
-    - 'vars/jellyfin.yml'
diff --git a/requirements.yml b/requirements.yml
deleted file mode 100644
index ba54c45..0000000
--- a/requirements.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- src: git+https://git.fudiggity.nl/ansible/common.git
-  name: common
-  version: master
-  scm: git
diff --git a/tasks/network.yml b/tasks/network.yml
index b61f9c8..28cc96d 100644
--- a/tasks/network.yml
+++ b/tasks/network.yml
@@ -47,6 +47,6 @@
     owner: root
     group: root
     mode: '0644'
-  notify: 
+  notify:
     - restart nftables
     - restart docker service
diff --git a/tasks/setup.yml b/tasks/setup.yml
index 547af4a..6408a0f 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -14,23 +14,23 @@
     owner: root
     group: root
     mode: '0644'
-  notify: reload ssh
+  notify: restart ssh
 
 - name: Copy wezterm terminfo file
   ansible.builtin.copy:
     src: 'files/wezterm.terminfo'
-    dest: '{{ ansible_env.HOME }}/.terminfo'
+    dest: /home/sonny/.terminfo
     mode: '0755'
   notify: Compile wezterm terminfo file
 
 - name: Disable user lingering
   become: true
-  ansible.builtin.command: 'loginctl disable-linger sonny'
+  ansible.builtin.command: loginctl disable-linger sonny
 
 - name: Copy unattended upgrades configuration
   become: true
   ansible.builtin.template:
-    src: 'templates/unattended-upgrades.j2'
+    src: templates/unattended-upgrades.j2
     dest: '/etc/apt/apt.conf.d/10periodic'
     owner: root
     group: root
diff --git a/tasks/syncthing.yml b/tasks/syncthing.yml
index f72646a..877b45d 100644
--- a/tasks/syncthing.yml
+++ b/tasks/syncthing.yml
@@ -27,7 +27,7 @@
 - name: Remove previous Syncthing configurations
   become: true
   ansible.builtin.file:
-    path: '{{  ansible_env.HOME }}/.config/syncthing'
+    path: /home/sonny/.config/syncthing
     state: absent
 
 - name: Copy docker compose configuration
diff --git a/tasks/transmission.yml b/tasks/transmission.yml
index c96f69f..31385b4 100644
--- a/tasks/transmission.yml
+++ b/tasks/transmission.yml
@@ -39,13 +39,13 @@
     path: '{{ item }}'
     state: absent
   loop:
-    - '/etc/systemd/system/transmission-daemon.service.d'
-    - '{{ ansible_env.HOME }}/.config/transmission-daemon'
+    - /etc/systemd/system/transmission-daemon.service.d
+    - /home/sonny/.config/transmission-daemon
 
 - name: Copy Dockerfile
   become: true
   ansible.builtin.copy:
-    src: 'files/transmission/Dockerfile'
+    src: files/transmission/Dockerfile
     dest: '{{ transmission_app_dir }}/Dockerfile'
     owner: sonny
     group: sonny
@@ -54,7 +54,7 @@
 - name: Copy docker compose configuration
   become: true
   ansible.builtin.template:
-    src: 'templates/transmission/docker-compose.j2'
+    src: templates/transmission/docker-compose.j2
     dest: '{{ transmission_app_dir }}/docker-compose.yml'
     owner: sonny
     group: sonny
@@ -78,7 +78,7 @@
 - name: Copy NGINX configuration
   become: true
   ansible.builtin.template:
-    src: 'templates/transmission/nginx.j2'
+    src: templates/transmission/nginx.j2
     dest: '{{ transmission_app_dir }}/nginx.conf.d/default.conf'
     owner: sonny
     group: sonny
diff --git a/templates/nginx/vpn.j2 b/templates/nginx/vpn.j2
deleted file mode 100644
index fbfab68..0000000
--- a/templates/nginx/vpn.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-# {{ ansible_managed }}
-
-server {
-	listen {{ vpn_listen_address }}:{{ https_port }} ssl;
-	ssl_certificate /etc/ssl/localcerts/nginx.pem;
-	ssl_certificate_key /etc/ssl/localcerts/nginx.key;
-	ssl_protocols TLSv1.2;
-	ssl_ciphers HIGH:!aNULL:!MD5;
-
-	access_log /var/log/nginx/vpn.log;
-	error_log /var/log/nginx/vpn_error.log;
-
-	location /radicale/ {
-		proxy_pass https://127.0.0.1:{{ radicale_app_port }}/;
-
-		proxy_set_header     X-Script-Name /radicale;
-		proxy_set_header     X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header     X-Remote-User $remote_user;
-		proxy_pass_header    Authorization;
-
-		auth_basic           "Radicale - Password Required";
-		auth_basic_user_file /etc/nginx/radicale/htpasswd;
-
-		proxy_ssl_certificate /etc/ssl/localcerts/radicale/client_cert.pem;
-		proxy_ssl_certificate_key /etc/ssl/localcerts/radicale/client_key.pem;
-		proxy_ssl_trusted_certificate /etc/ssl/localcerts/radicale/server_cert.pem;
-	}
-}