diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index e020920..e6ecae3 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -23,6 +23,7 @@
 			zone_token {env.CF_ZONE_TOKEN}
 			api_token {env.CF_API_TOKEN}
 		}
+		resolvers 1.1.1.1 1.0.0.1
 	}
 }
 (secure) {
@@ -62,7 +63,7 @@
 		import ttt-log {args[0]}
 		import tls
 		import secure *
-		import ttt-proxy 192.168.1.234 {args[1]}
+		import ttt-proxy host.docker.internal {args[1]}
 	}
 }
 (ttt-app-alt) {
@@ -108,7 +109,7 @@ import ttt-app homepage 3001
 
 # Alternate configuration (different subdomain and docker compose project name)
 import ttt-app-alt budget actual-server-app-1 5006
-import ttt-app-alt trilium triliumnext-notes-app-1 8040
-import ttt-app-alt notes triliumnext-notes-app-1 8040
+import ttt-app-alt trilium triliumnext-notes-app-1 8080
+import ttt-app-alt notes triliumnext-notes-app-1 8080
 import ttt-app-alt stash stashapp-app-1 9999
 import ttt-app-alt pihole1 192.168.1.116 80
diff --git a/caddy/docker-compose.yml b/caddy/docker-compose.yml
index 46e08b8..c26714a 100644
--- a/caddy/docker-compose.yml
+++ b/caddy/docker-compose.yml
@@ -3,8 +3,11 @@ services:
   app:
     build: .
     restart: unless-stopped
+    env_file: .env
     networks:
       - proxy-net
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     ports:
       - "80:80"
       - "443:443"
@@ -29,4 +32,4 @@ configs:
 
 volumes:
   caddy_data:
-  caddy_config:
\ No newline at end of file
+  caddy_config:
diff --git a/triliumnext-notes/docker-compose.yml b/triliumnext-notes/docker-compose.yml
index 459e82f..4fa8300 100644
--- a/triliumnext-notes/docker-compose.yml
+++ b/triliumnext-notes/docker-compose.yml
@@ -8,8 +8,6 @@ services:
       - ./config:/home/node/trilium-config
     networks:
       - proxy-net
-    ports:
-      - "127.0.0.1:8040:8080"
     environment:
       USER_UID: 1000
       USER_GID: 1000