diff --git a/compose.authentik.yaml b/compose.authentik.yaml
index 68c5377..60a024c 100644
--- a/compose.authentik.yaml
+++ b/compose.authentik.yaml
@@ -54,7 +54,7 @@ services:
       - authentik-postgres
       - authentik-redis
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
 
   authentik-worker:
     image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.8.1}
diff --git a/compose.borgmatic.yaml b/compose.borgmatic.yaml
index 7a9d31a..f0eefc8 100644
--- a/compose.borgmatic.yaml
+++ b/compose.borgmatic.yaml
@@ -6,7 +6,7 @@ services:
     environment:
       - TZ=Europe/Amsterdam
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
     healthcheck:
       test: ["CMD", "pgrep", "crond"]
       interval: 20s
diff --git a/compose.caddy.yaml b/compose.caddy.yaml
index 7504804..501e397 100644
--- a/compose.caddy.yaml
+++ b/compose.caddy.yaml
@@ -24,4 +24,4 @@ services:
       - /opt/caddy/data:/data/caddy
       - /opt/caddy/logs:/var/log
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
diff --git a/compose.collectd.yaml b/compose.collectd.yaml
index 596c951..9fc8598 100644
--- a/compose.collectd.yaml
+++ b/compose.collectd.yaml
@@ -16,4 +16,4 @@ services:
       - /var/lib/docker:/media/docker:ro
       - /dev/mapper:/dev/mapper
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
diff --git a/compose.fluentbit.yaml b/compose.fluentbit.yaml
index 513e0df..4257ed8 100644
--- a/compose.fluentbit.yaml
+++ b/compose.fluentbit.yaml
@@ -20,4 +20,4 @@ services:
       - DATABASE_PASS=${FLUENTBIT_DATABASE_PASS}
       - DATABASE_NAME=${FLUENTBIT_DATABASE_NAME}
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
diff --git a/compose.gitea.yaml b/compose.gitea.yaml
index 307b3fa..79fbeb1 100644
--- a/compose.gitea.yaml
+++ b/compose.gitea.yaml
@@ -19,7 +19,7 @@ services:
       - GITEA__mailer__PROTOCOL=smtp+starttls
     restart: always
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
     volumes:
       - /opt/gitea:/data
       - /etc/timezone:/etc/timezone:ro
diff --git a/compose.grafana.yaml b/compose.grafana.yaml
index fdb9d03..df94cc7 100644
--- a/compose.grafana.yaml
+++ b/compose.grafana.yaml
@@ -18,4 +18,4 @@ services:
       - /opt/grafana:/var/lib/grafana
       # - /opt/grafana/grafana.ini:/etc/grafana/grafana.ini
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
diff --git a/compose.homeassistant.yaml b/compose.homeassistant.yaml
index eaefc44..c513317 100644
--- a/compose.homeassistant.yaml
+++ b/compose.homeassistant.yaml
@@ -9,4 +9,4 @@ services:
       - /opt/homeassistant:/config
       - /etc/localtime:/etc/localtime:ro
     extra_hosts:
-    - host:192.168.2.200
+    - "host:${HOST_IP}"
diff --git a/compose.loki.yaml b/compose.loki.yaml
index e7293c8..6f120bf 100644
--- a/compose.loki.yaml
+++ b/compose.loki.yaml
@@ -11,4 +11,4 @@ services:
       - /opt/loki/local-config.yaml:/etc/loki/local-config.yaml:ro
       - /opt/loki/data:/loki
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
diff --git a/compose.mosquitto.yaml b/compose.mosquitto.yaml
index e3de98a..cb47038 100644
--- a/compose.mosquitto.yaml
+++ b/compose.mosquitto.yaml
@@ -11,4 +11,4 @@ services:
       - /opt/mosquitto/data:/mosquitto/data
       - /opt/mosquitto/log:/mosquitto/log
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
diff --git a/compose.nodered.yaml b/compose.nodered.yaml
index 002612f..7b89351 100644
--- a/compose.nodered.yaml
+++ b/compose.nodered.yaml
@@ -9,5 +9,5 @@ services:
     environment:
       - TZ=Europe/Amsterdam
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
       - mqqtt:192.168.2.200
diff --git a/compose.openvpn-server.yaml b/compose.openvpn-server.yaml
index 1175d54..6450df0 100644
--- a/compose.openvpn-server.yaml
+++ b/compose.openvpn-server.yaml
@@ -4,7 +4,7 @@ services:
       - NET_ADMIN
     container_name: openvpn-server
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
     image: kylemanna/openvpn:2.4
     ports:
       - 444:443
diff --git a/compose.telegraf.yaml b/compose.telegraf.yaml
index 3060bda..f4f368c 100644
--- a/compose.telegraf.yaml
+++ b/compose.telegraf.yaml
@@ -13,6 +13,6 @@ services:
       - DATABASE_PASS=${TELEGRAF_DATABASE_PASS}
       - DATABASE_NAME=${TELEGRAF_DATABASE_NAME}
     extra_hosts:
-    - host:192.168.2.200
+    - "host:${HOST_IP}"
     volumes:
       - /opt/telegraf/telegraf.conf:/etc/telegraf/telegraf.conf:ro
diff --git a/compose.teslamate.yaml b/compose.teslamate.yaml
index 410b278..062db20 100644
--- a/compose.teslamate.yaml
+++ b/compose.teslamate.yaml
@@ -17,7 +17,7 @@ services:
     ports:
       - 4000:4000
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
     volumes:
       - /opt/teslamate/import:/opt/app/import
     cap_drop:
@@ -38,7 +38,7 @@ services:
     ports:
       - 3004:3000
     extra_hosts:
-      - host:192.168.2.200
+      - "host:${HOST_IP}"
     volumes:
       - /opt/teslamate/grafana:/var/lib/grafana
       - /opt/teslamate/achievements/dashboard.yml:/etc/grafana/provisioning/dashboards/dashboard.yml