diff --git a/config/ansible/tasks/servers/server.yml b/config/ansible/tasks/servers/server.yml
index 8d5745d..03178a9 100644
--- a/config/ansible/tasks/servers/server.yml
+++ b/config/ansible/tasks/servers/server.yml
@@ -46,14 +46,14 @@
 
   vars:
     services:
-      - name: gitea
-        enabled: true
-        hosts:
-          - mennos-cloud-server
       - name: uptime-kuma
         enabled: true
         hosts:
           - mennos-cloud-server
+      - name: gitea
+        enabled: true
+        hosts:
+          - mennos-cachyos-desktop
       - name: factorio
         enabled: true
         hosts:
diff --git a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2 b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
index f03ccdf..72a79b2 100644
--- a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
+++ b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
@@ -29,15 +29,22 @@
 {% endif %}
 
 {% if inventory_hostname == 'mennos-cloud-server' %}
-git.vleeuwen.me git.mvl.sh {
+status.vleeuwen.me status.mvl.sh {
+   import country_block
+   reverse_proxy uptime-kuma:3001
+   tls {{ caddy_email }}
+}
+
+{% elif inventory_hostname == 'mennos-cachyos-desktop' %}
+git.mvl.sh {
    import country_block
    reverse_proxy gitea:3000
    tls {{ caddy_email }}
 }
 
-status.vleeuwen.me status.mvl.sh {
+git.vleeuwen.me {
    import country_block
-   reverse_proxy uptime-kuma:3001
+   redir https://git.mvl.sh{uri}
    tls {{ caddy_email }}
 }
 
@@ -47,7 +54,6 @@ df.mvl.sh {
    tls {{ caddy_email }}
 }
 
-{% elif inventory_hostname == 'mennos-cachyos-desktop' %}
 fsm.mvl.sh {
    import country_block
    reverse_proxy factorio-server-manager:80
diff --git a/config/ansible/tasks/servers/services/caddy/caddy.yml b/config/ansible/tasks/servers/services/caddy/caddy.yml
index cd4070d..40b7aeb 100644
--- a/config/ansible/tasks/servers/services/caddy/caddy.yml
+++ b/config/ansible/tasks/servers/services/caddy/caddy.yml
@@ -4,8 +4,8 @@
       - name: Set Caddy directories
         ansible.builtin.set_fact:
             caddy_service_dir: "{{ ansible_env.HOME }}/services/caddy"
-            caddy_data_dir: "{{ '/mnt/services/caddy' if inventory_hostname == 'mennos-cachyos-desktop' else '/mnt/object_storage/services/caddy' }}"
-            geoip_db_path: "{{ '/mnt/services/echoip' if inventory_hostname == 'mennos-cachyos-desktop' else '/mnt/object_storage/services/echoip' }}"
+            caddy_data_dir: "/mnt/services/caddy"
+            geoip_db_path: "/mnt/services/echoip"
             caddy_email: "{{ lookup('community.general.onepassword', 'Caddy (Proxy)', vault='Dotfiles', field='email') }}"
 
       - name: Create Caddy directory
diff --git a/config/ansible/tasks/servers/services/gitea/gitea.yml b/config/ansible/tasks/servers/services/gitea/gitea.yml
index 56f67fc..43ef5a7 100644
--- a/config/ansible/tasks/servers/services/gitea/gitea.yml
+++ b/config/ansible/tasks/servers/services/gitea/gitea.yml
@@ -3,7 +3,7 @@
   block:
     - name: Set Gitea directories
       ansible.builtin.set_fact:
-        gitea_data_dir: "/mnt/object_storage/services/gitea"
+        gitea_data_dir: "/mnt/services/gitea"
         gitea_service_dir: "{{ ansible_env.HOME }}/services/gitea"
 
     - name: Create Gitea directories