diff --git a/docker/docker-compose.local.yml b/docker/docker-compose.local.yml
index bd0b225a62..a14d9a4eaf 100644
--- a/docker/docker-compose.local.yml
+++ b/docker/docker-compose.local.yml
@@ -7,28 +7,30 @@ services:
     build:
       context: prometheus
     environment:
-      # Linux:  http://localhost:8008
-      # MacOSX: http://host.docker.internal:8008
-      BEACON_URL: localhost:8008
-      VC_URL: localhost:5064
+      BEACON_URL: host.docker.internal:8008
+      VC_URL: host.docker.internal:5064
     restart: always
-    network_mode: host
     volumes:
       - "prometheus:/prometheus"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    ports:
+      - "127.0.0.1:9090:9090"
 
   grafana:
     build:
       context: ..
       dockerfile: docker/grafana
     restart: always
-    network_mode: host
     volumes:
       - "grafana:/var/lib/grafana"
       - "grafana-dashboards:/dashboards"
     environment:
-      # Linux:  http://localhost:9090
-      # MacOSX: http://host.docker.internal:9090
-      PROMETHEUS_URL: http://localhost:9090
+      PROMETHEUS_URL: http://host.docker.internal:9090
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    ports:
+      - "127.0.0.1:3000:3000"
 
 volumes:
   prometheus:
diff --git a/docker/docker-compose.local_dev.yml b/docker/docker-compose.local_dev.yml
index 0a3f10cd06..e25126175a 100644
--- a/docker/docker-compose.local_dev.yml
+++ b/docker/docker-compose.local_dev.yml
@@ -12,26 +12,28 @@ services:
     build:
       context: prometheus
     environment:
-      # Linux:  http://localhost:8008
-      # MacOSX: http://host.docker.internal:8008
-      BEACON_URL: localhost:8008
-      VC_URL: localhost:5064
+      BEACON_URL: host.docker.internal:8008
+      VC_URL: host.docker.internal:5064
     restart: always
-    network_mode: host
     volumes:
       - "prometheus:/prometheus"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    ports:
+      - "127.0.0.1:9090:9090"
 
   grafana:
     build: grafana_dev
     restart: always
-    network_mode: host
     volumes:
       - "grafana:/var/lib/grafana"
       - "grafana-dashboards:/dashboards"
     environment:
-      # Linux:  http://localhost:9090
-      # MacOSX: http://host.docker.internal:9090
-      PROMETHEUS_URL: http://localhost:9090
+      PROMETHEUS_URL: http://host.docker.internal:9090
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    ports:
+      - "127.0.0.1:3000:3000"
 
 volumes:
   prometheus: