diff --git a/README.md b/README.md
index 67396b9..473cff2 100755
--- a/README.md
+++ b/README.md
@@ -67,7 +67,17 @@ If you add a new system you should add the relevant files to these paths.
 - `config/ssh/authorized_keys`: Contains the public keys per hostname that will be symlinked to the `~/.ssh/authorized_keys` file.
 - `config/home-manager/flake.nix`: Contains an array `homeConfigurations` where you should be adding the new system hostname and relevant configuration.
 
-### Object Storage
+### Server reboots
+
+In case you reboot a server, it's likely that this runs JuiceFS.
+To be sure that every service is properly accessing JuiceFS mounted files you should probably restart the services once when the server comes online.
+```bash
+dotf service stop --all
+df # confirm JuiceFS is mounted
+dotf service start --all
+```
+
+### Object Storage (Servers only)
 
 In case you need to adjust anything regarding the /mnt/object_storage JuiceFS.
 Ensure to shut down all services:
diff --git a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2 b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
index 86c6202..da43820 100644
--- a/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
+++ b/config/ansible/tasks/servers/services/caddy/Caddyfile.j2
@@ -64,6 +64,10 @@ fladder.mvl.sh {
 }
 
 ip.mvl.sh {
-    reverse_proxy echoip:8080
+    reverse_proxy echoip:8080 {
+        header_up X-Real-IP {remote}
+        header_up X-Forwarded-For {remote}
+        header_up X-Forwarded-Proto {scheme}
+    }
     tls {{ caddy_email }}
 }
diff --git a/config/ansible/tasks/servers/services/dozzle/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/dozzle/docker-compose.yml.j2
index 6c4c290..59c9bad 100644
--- a/config/ansible/tasks/servers/services/dozzle/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/dozzle/docker-compose.yml.j2
@@ -4,7 +4,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     ports:
-      - 8080:8080
+      - 8585:8080
     environment:
       - DOZZLE_NO_ANALYTICS=true
     restart: unless-stopped
diff --git a/config/ansible/tasks/servers/services/echoip/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/echoip/docker-compose.yml.j2
index ae399a9..ce03f59 100644
--- a/config/ansible/tasks/servers/services/echoip/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/echoip/docker-compose.yml.j2
@@ -3,12 +3,4 @@ services:
     container_name: 'echoip'
     image: 'mpolden/echoip:latest'
     restart: unless-stopped
-    ports:
-      - '8585:8080'
-    networks:
-      - caddy_network
-
-networks:
-  caddy_network:
-    external: true
-    name: caddy_default
+    network_mode: 'host'