diff --git a/netbird-server/rootfs/etc/cont-init.d/00-config.sh b/netbird-server/rootfs/etc/cont-init.d/00-config.sh
index c233205ae..12ca4c61a 100755
--- a/netbird-server/rootfs/etc/cont-init.d/00-config.sh
+++ b/netbird-server/rootfs/etc/cont-init.d/00-config.sh
@@ -147,8 +147,8 @@ if [[ ! -f "$CADDYFILE" ]]; then
   bashio::log.info "Generating Caddyfile at ${CADDYFILE}."
   cat <<CONFIG > "$CADDYFILE"
 {
-  servers {
-    protocols h1 h2 h2c
+  servers :80,:443 {
+    protocols h1 h2c h2 h3
   }
 }
 
diff --git a/netbird-server/rootfs/etc/services.d/signal/run b/netbird-server/rootfs/etc/services.d/signal/run
index 1170bf5e8..5dc805860 100644
--- a/netbird-server/rootfs/etc/services.d/signal/run
+++ b/netbird-server/rootfs/etc/services.d/signal/run
@@ -8,12 +8,10 @@ set -euo pipefail
 # ==============================================================================
 
 SIGNAL_PORT=8083
-SIGNAL_GRPC_PORT=10000
 LOG_LEVEL="info"
 
-bashio::log.info "Starting NetBird Signal on port ${SIGNAL_PORT} (gRPC: ${SIGNAL_GRPC_PORT})..."
+bashio::log.info "Starting NetBird Signal on port ${SIGNAL_PORT} (legacy gRPC on 10000)..."
 exec /usr/local/bin/netbird-signal run \
   --port "$SIGNAL_PORT" \
-  --grpc-port "$SIGNAL_GRPC_PORT" \
   --log-level "$LOG_LEVEL" \
   --log-file console