diff --git a/config/ansible/tasks/servers/server.yml b/config/ansible/tasks/servers/server.yml
index 39d96da..5c0c74a 100644
--- a/config/ansible/tasks/servers/server.yml
+++ b/config/ansible/tasks/servers/server.yml
@@ -131,4 +131,4 @@
       - name: unifi-network-application
         enabled: true
         hosts:
-          - mennos-cloud-server
+          - mennos-cachyos-desktop
diff --git a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2 b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
index df64b62..339212a 100644
--- a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
+++ b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
@@ -100,6 +100,28 @@ home.vleeuwen.me {
    tls {{ caddy_email }}
 }
 
+unifi.mvl.sh {
+  reverse_proxy unifi-controller:8443 {
+    transport http {
+      tls_insecure_skip_verify
+    }
+    header_up Host {host}
+    header_up X-Forwarded-Proto https
+  }
+}
+
+hotspot.mvl.sh {
+  reverse_proxy unifi-controller:8843 {
+    transport http {
+      tls_insecure_skip_verify
+    }
+  }
+}
+
+hotspot.mvl.sh:80 {
+  reverse_proxy unifi-controller:8880
+}
+
 bin.mvl.sh {
    import country_block
    reverse_proxy privatebin:8080
diff --git a/config/ansible/tasks/servers/services/unifi-network-application/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/unifi-network-application/docker-compose.yml.j2
index e969ec6..ca22905 100644
--- a/config/ansible/tasks/servers/services/unifi-network-application/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/unifi-network-application/docker-compose.yml.j2
@@ -3,13 +3,16 @@ services:
     image: linuxserver/unifi-network-application:latest
     restart: unless-stopped
     ports:
-      - "8080:8080"     # Device communication
-      - "8443:8443"     # Controller GUI / API
-      - "3478:3478/udp" # STUN
+      - "8080:8080"      # Device communication
+      - "8443:8443"      # Controller GUI / API
+      - "3478:3478/udp"  # STUN
       - "10001:10001/udp" # AP discovery
+      - "8880:8880"      # HTTP portal redirect (guest hotspot)
+      - "8843:8843"      # HTTPS portal redirect (guest hotspot)
+      - "6789:6789"      # Mobile speed test (optional)
     environment:
       - PUID=1000
-      - PGID=1000
+      - PGID=100
       - TZ=Europe/Amsterdam
       - MONGO_USER=unifi
       - MONGO_PASS=unifi
diff --git a/config/ansible/tasks/servers/services/unifi-network-application/unifi-network-application.yml b/config/ansible/tasks/servers/services/unifi-network-application/unifi-network-application.yml
index 247c53f..201d124 100644
--- a/config/ansible/tasks/servers/services/unifi-network-application/unifi-network-application.yml
+++ b/config/ansible/tasks/servers/services/unifi-network-application/unifi-network-application.yml
@@ -3,7 +3,7 @@
   block:
     - name: Set Unifi Network App directories
       ansible.builtin.set_fact:
-        unifi_network_application_data_dir: "/mnt/object_storage/services/unifi_network_application"
+        unifi_network_application_data_dir: "/mnt/services/unifi_network_application"
         unifi_network_application_service_dir: "{{ ansible_env.HOME }}/services/unifi_network_application"
 
     - name: Create Unifi Network App directories