diff --git a/ansible/services/forgejo/deploy_forgejo_playbook.yml b/ansible/services/forgejo/deploy_forgejo_playbook.yml
index acb1473..db78e95 100644
--- a/ansible/services/forgejo/deploy_forgejo_playbook.yml
+++ b/ansible/services/forgejo/deploy_forgejo_playbook.yml
@@ -8,7 +8,6 @@
     - ./forgejo_vars.yml
   vars:
     forgejo_subdomain: "{{ subdomains.forgejo }}"
-    caddy_sites_dir: "{{ caddy_sites_dir }}"
     forgejo_domain: "{{ forgejo_subdomain }}.{{ root_domain }}"
     uptime_kuma_api_url: "https://{{ subdomains.uptime_kuma }}.{{ root_domain }}"
 
@@ -88,35 +87,13 @@
         enabled: yes
         state: started
 
-    - name: Ensure Caddy sites-enabled directory exists
-      file:
-        path: "{{ caddy_sites_dir }}"
-        state: directory
-        owner: root
-        group: root
-        mode: '0755'
-
-    - name: Ensure Caddyfile includes import directive for sites-enabled
-      lineinfile:
-        path: /etc/caddy/Caddyfile
-        line: 'import sites-enabled/*'
-        insertafter: EOF
-        state: present
-        backup: yes
-
-    - name: Create Caddy reverse proxy configuration for forgejo
-      copy:
-        dest: "{{ caddy_sites_dir }}/forgejo.conf"
-        content: |
-          {{ forgejo_domain }} {
-              reverse_proxy localhost:{{ forgejo_port }}
-          }
-        owner: root
-        group: root
-        mode: '0644'
-
-    - name: Reload Caddy to apply new config
-      command: systemctl reload caddy
+    - name: Publish Forgejo through Caddy
+      ansible.builtin.include_role:
+        name: caddy_site
+      vars:
+        caddy_site_name: forgejo
+        caddy_site_domain: "{{ forgejo_domain }}"
+        caddy_site_upstream: "localhost:{{ forgejo_port }}"
 
     # ═════════════════════════════════════════════════════════════════════════
     # DEPRECATED — Uptime Kuma was decommissioned on 2026-09-11.
diff --git a/ansible/services/ntfy-emergency-app/deploy_ntfy_emergency_app_playbook.yml b/ansible/services/ntfy-emergency-app/deploy_ntfy_emergency_app_playbook.yml
index a8d97a6..7379d5f 100644
--- a/ansible/services/ntfy-emergency-app/deploy_ntfy_emergency_app_playbook.yml
+++ b/ansible/services/ntfy-emergency-app/deploy_ntfy_emergency_app_playbook.yml
@@ -8,7 +8,6 @@
     - ./ntfy_emergency_app_vars.yml
   vars:
     ntfy_emergency_app_subdomain: "{{ subdomains.ntfy_emergency_app }}"
-    caddy_sites_dir: "{{ caddy_sites_dir }}"
     ntfy_emergency_app_domain: "{{ ntfy_emergency_app_subdomain }}.{{ root_domain }}"
     ntfy_service_domain: "{{ subdomains.ntfy }}.{{ root_domain }}"
     ntfy_emergency_app_ntfy_url: "https://{{ ntfy_service_domain }}"
@@ -49,35 +48,13 @@
       args:
         chdir: "{{ ntfy_emergency_app_dir }}"
 
-    - name: Ensure Caddy sites-enabled directory exists
-      file:
-        path: "{{ caddy_sites_dir }}"
-        state: directory
-        owner: root
-        group: root
-        mode: '0755'
-
-    - name: Ensure Caddyfile includes import directive for sites-enabled
-      lineinfile:
-        path: /etc/caddy/Caddyfile
-        line: 'import sites-enabled/*'
-        insertafter: EOF
-        state: present
-        backup: yes
-
-    - name: Create Caddy reverse proxy configuration for ntfy-emergency-app
-      copy:
-        dest: "{{ caddy_sites_dir }}/ntfy-emergency-app.conf"
-        content: |
-          {{ ntfy_emergency_app_domain }} {
-              reverse_proxy localhost:{{ ntfy_emergency_app_port }}
-          }
-        owner: root
-        group: root
-        mode: '0644'
-
-    - name: Reload Caddy to apply new config
-      command: systemctl reload caddy
+    - name: Publish ntfy-emergency-app through Caddy
+      ansible.builtin.include_role:
+        name: caddy_site
+      vars:
+        caddy_site_name: ntfy-emergency-app
+        caddy_site_domain: "{{ ntfy_emergency_app_domain }}"
+        caddy_site_upstream: "localhost:{{ ntfy_emergency_app_port }}"
 
     # ═════════════════════════════════════════════════════════════════════════
     # DEPRECATED — Uptime Kuma was decommissioned on 2026-09-11.
diff --git a/ansible/services/vaultwarden/deploy_vaultwarden_playbook.yml b/ansible/services/vaultwarden/deploy_vaultwarden_playbook.yml
index 9868d13..74e87d8 100644
--- a/ansible/services/vaultwarden/deploy_vaultwarden_playbook.yml
+++ b/ansible/services/vaultwarden/deploy_vaultwarden_playbook.yml
@@ -8,7 +8,6 @@
     - ./vaultwarden_vars.yml
   vars:
     vaultwarden_subdomain: "{{ subdomains.vaultwarden }}"
-    caddy_sites_dir: "{{ caddy_sites_dir }}"
     vaultwarden_domain: "{{ vaultwarden_subdomain }}.{{ root_domain }}"
     uptime_kuma_api_url: "https://{{ subdomains.uptime_kuma }}.{{ root_domain }}"
 
@@ -81,35 +80,13 @@
         name: fail2ban
         state: restarted
 
-    - name: Ensure Caddy sites-enabled directory exists
-      file:
-        path: "{{ caddy_sites_dir }}"
-        state: directory
-        owner: root
-        group: root
-        mode: '0755'
-
-    - name: Ensure Caddyfile includes import directive for sites-enabled
-      lineinfile:
-        path: /etc/caddy/Caddyfile
-        line: 'import sites-enabled/*'
-        insertafter: EOF
-        state: present
-        backup: yes
-
-    - name: Create Caddy reverse proxy configuration for vaultwarden
-      copy:
-        dest: "{{ caddy_sites_dir }}/vaultwarden.conf"
-        content: |
-          {{ vaultwarden_domain }} {
-              reverse_proxy localhost:{{ vaultwarden_port }}
-          }
-        owner: root
-        group: root
-        mode: '0644'
-
-    - name: Reload Caddy to apply new config
-      command: systemctl reload caddy
+    - name: Publish Vaultwarden through Caddy
+      ansible.builtin.include_role:
+        name: caddy_site
+      vars:
+        caddy_site_name: vaultwarden
+        caddy_site_domain: "{{ vaultwarden_domain }}"
+        caddy_site_upstream: "localhost:{{ vaultwarden_port }}"
 
     # ═════════════════════════════════════════════════════════════════════════
     # DEPRECATED — Uptime Kuma was decommissioned on 2026-09-11.