diff --git a/Caddy.Dockerfile b/Caddy.Dockerfile
index 84bbc1fca..3c0931bbb 100644
--- a/Caddy.Dockerfile
+++ b/Caddy.Dockerfile
@@ -1,3 +1,3 @@
-FROM caddy:2.6.4
+FROM caddy:2.7.2
 RUN apk add --no-cache ca-certificates tzdata
 COPY Caddyfile /etc/caddy/Caddyfile
diff --git a/rootfs/bin/healthcheck.sh b/rootfs/bin/healthcheck.sh
index 83179b34d..237753503 100755
--- a/rootfs/bin/healthcheck.sh
+++ b/rootfs/bin/healthcheck.sh
@@ -1,17 +1,19 @@
 #!/bin/sh
 
 export HC_IP="localhost"
-export NPM_PORT="${NPM_PORT:-81}"
 
 if [ "$NPM_LISTEN_LOCALHOST" = "true" ]; then
     export NPM_IPV4_BINDING="127.0.0.1"
     export NPM_IPV6_BINDING="[::1]"
 fi
 
-if [ -n "$NPM_IPV6_BINDING" ]; then
-    export HC_IP="$NPM_IPV6_BINDING"
-elif [ -n "$NPM_IPV4_BINDING" ]; then
-    export HC_IP="$NPM_IPV4_BINDING"
+if [ "$NPM_IPV6_BINDING" != "[::]" ] && [ "$NPM_IPV4_BINDING" != "0.0.0.0" ]; then
+    if [ "$NPM_IPV6_BINDING" != "[::]" ]; then
+        export HC_IP="$NPM_IPV6_BINDING"
+    fi
+    if [ "$NPM_IPV4_BINDING" != "0.0.0.0" ]; then
+        export HC_IP="$NPM_IPV4_BINDING"
+    fi
 fi
 
 if (if [ "$PHP81" = true ]; then cgi-fcgi -bind -connect /dev/php81.sock > /dev/null 2>&1; fi && if [ "$PHP82" = true ]; then cgi-fcgi -bind -connect /dev/php82.sock > /dev/null 2>&1; fi && [ "$(curl -sk https://"$HC_IP":"$NPM_PORT"/api/ | jq --raw-output .status)" = "OK" ]); then
diff --git a/rootfs/bin/start.sh b/rootfs/bin/start.sh
index 703042e88..1bc47170f 100755
--- a/rootfs/bin/start.sh
+++ b/rootfs/bin/start.sh
@@ -160,7 +160,7 @@ apk add --no-cache php81-fpm
 
     mkdir -vp /data/php
     cp -vrnT /etc/php81 /data/php/81
-    sed -i "s|listen =.*|listen = /var/php81.sock|" /data/php/81/php-fpm.d/www.conf
+    sed -i "s|listen =.*|listen = /var/run/php81.sock|" /data/php/81/php-fpm.d/www.conf
     sed -i "s|include=.*|include=/data/php/81/php-fpm.d/*.conf|g" /data/php/81/php-fpm.conf
 
 elif [ "$FULLCLEAN" = "true" ]; then
@@ -192,7 +192,7 @@ apk add --no-cache php82-fpm
 
     mkdir -vp /data/php
     cp -vrnT /etc/php82 /data/php/82
-    sed -i "s|listen =.*|listen = /var/php82.sock|" /data/php/82/php-fpm.d/www.conf
+    sed -i "s|listen =.*|listen = /var/run/php82.sock|" /data/php/82/php-fpm.d/www.conf
     sed -i "s|include=.*|include=/data/php/82/php-fpm.d/*.conf|g" /data/php/82/php-fpm.conf
 
 elif [ "$FULLCLEAN" = "true" ]; then
diff --git a/rootfs/usr/local/nginx/conf/nginx.conf b/rootfs/usr/local/nginx/conf/nginx.conf
index 0eab1756f..2cfa832dc 100644
--- a/rootfs/usr/local/nginx/conf/nginx.conf
+++ b/rootfs/usr/local/nginx/conf/nginx.conf
@@ -70,11 +70,11 @@ http {
     }
 
     upstream php81 {
-        server unix:/var/php81.sock;
+        server unix:/var/run/php81.sock;
     }
 
     upstream php82 {
-        server unix:/var/php82.sock;
+        server unix:/var/run/php82.sock;
     }
 
     # Fancy Index