diff --git a/roles/caddy/tasks/main.yml b/roles/caddy/tasks/main.yml
index f447b18..641ae15 100644
--- a/roles/caddy/tasks/main.yml
+++ b/roles/caddy/tasks/main.yml
@@ -16,23 +16,22 @@
     mode: "0755"
   become: true
 
-- name: Create caddy group
-  ansible.builtin.group:
-    name: caddy
-    state: present
-    system: true
-  become: true
-
 - name: Create caddy user
   ansible.builtin.user:
     name: caddy
-    group: caddy
-    create_home: false
+    home: /var/lib/caddy
     shell: /usr/sbin/nologin
     system: true
     state: present
   become: true
 
+- name: Add user to caddy group
+  ansible.builtin.user:
+    name: "{{ ansible_user_id }}"
+    groups: caddy
+    append: true
+  become: true
+
 - name: Create /etc/caddy folder
   ansible.builtin.file:
     path: /etc/caddy
@@ -59,3 +58,17 @@
     mode: "2775"
     state: directory
   become: true
+
+- name: Create symlink from home to /var/www folder
+  ansible.builtin.file:
+    path: "{{ ansible_user_dir }}/www"
+    src: /var/www
+    state: link
+
+- name: Symlink Caddyfile to /var/www folder
+  ansible.builtin.file:
+    path: /var/www/Caddyfile
+    src: /etc/caddy/Caddyfile
+    owner: "{{ ansible_user_id }}"
+    state: link
+  become: true