diff --git a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2 b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
index 339212a..ff0068b 100644
--- a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
+++ b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
@@ -29,18 +29,6 @@
 {% endif %}
 
 {% if inventory_hostname == 'mennos-cloud-server' %}
-photos.mvl.sh {
-   import country_block
-   reverse_proxy immich:2283
-   tls {{ caddy_email }}
-}
-
-photos.vleeuwen.me {
-   import country_block
-   redir https://photos.mvl.sh{uri}
-   tls {{ caddy_email }}
-}
-
 karakeep.mvl.sh {
    import country_block
    reverse_proxy karakeep:3000
@@ -64,17 +52,6 @@ status.vleeuwen.me status.mvl.sh {
    tls {{ caddy_email }}
 }
 
-of.mvl.sh {
-   import country_block
-   reverse_proxy onlyoffice:80 {
-       header_up Host {host}
-       header_up X-Real-IP {remote}
-       header_up X-Forwarded-For {remote}
-       header_up X-Forwarded-Proto {scheme}
-   }
-   tls {{ caddy_email }}
-}
-
 fsm.mvl.sh {
    import country_block
    reverse_proxy factorio-server-manager:80
@@ -88,6 +65,18 @@ df.mvl.sh {
 }
 
 {% elif inventory_hostname == 'mennos-cachyos-desktop' %}
+photos.mvl.sh {
+   import country_block
+   reverse_proxy immich:2283
+   tls {{ caddy_email }}
+}
+
+photos.vleeuwen.me {
+   import country_block
+   redir https://photos.mvl.sh{uri}
+   tls {{ caddy_email }}
+}
+
 home.vleeuwen.me {
    import country_block
    reverse_proxy host.docker.internal:8123 {
@@ -101,25 +90,29 @@ home.vleeuwen.me {
 }
 
 unifi.mvl.sh {
-  reverse_proxy unifi-controller:8443 {
-    transport http {
-      tls_insecure_skip_verify
+    reverse_proxy unifi-controller:8443 {
+        transport http {
+            tls_insecure_skip_verify
+        }
+        header_up Host {host}
+        header_up X-Forwarded-Proto https
     }
-    header_up Host {host}
-    header_up X-Forwarded-Proto https
-  }
+    tls {{ caddy_email }}
 }
 
 hotspot.mvl.sh {
-  reverse_proxy unifi-controller:8843 {
-    transport http {
-      tls_insecure_skip_verify
+    reverse_proxy unifi-controller:8843 {
+        transport http {
+            tls_insecure_skip_verify
+        }
+        header_up Host {host}
+        header_up X-Forwarded-Proto https
     }
-  }
+    tls {{ caddy_email }}
 }
 
 hotspot.mvl.sh:80 {
-  reverse_proxy unifi-controller:8880
+    redir https://hotspot.mvl.sh{uri} permanent
 }
 
 bin.mvl.sh {