diff --git a/.devenv/docker/clickhouse/compose.yaml b/.devenv/docker/clickhouse/compose.yaml
index 7592202c1183..41e44119f141 100644
--- a/.devenv/docker/clickhouse/compose.yaml
+++ b/.devenv/docker/clickhouse/compose.yaml
@@ -8,8 +8,8 @@ services:
       - ${PWD}/fs/tmp/var/lib/clickhouse/:/var/lib/clickhouse/
       - ${PWD}/fs/tmp/var/lib/clickhouse/user_scripts/:/var/lib/clickhouse/user_scripts/
     ports:
-      - '127.0.0.1:8123:8123'
-      - '127.0.0.1:9000:9000'
+      - '0.0.0.0:8123:8123'
+      - '0.0.0.0:9000:9000'
     tty: true
     healthcheck:
       test:
@@ -23,6 +23,8 @@ services:
       retries: 3
     depends_on:
       - zookeeper
+    networks:
+      - signoz-dev-network
   zookeeper:
     image: bitnami/zookeeper:3.7.1
     container_name: zookeeper
@@ -30,6 +32,8 @@ services:
       - ${PWD}/fs/tmp/zookeeper:/bitnami/zookeeper
     ports:
       - '127.0.0.1:2181:2181'
+    networks:
+      - signoz-dev-network
     environment:
       - ALLOW_ANONYMOUS_LOGIN=yes
     healthcheck:
@@ -52,6 +56,8 @@ services:
       clickhouse:
         condition: service_healthy
     restart: on-failure
+    networks:
+      - signoz-dev-network
   schema-migrator-async:
     image: signoz/signoz-schema-migrator:v0.129.0
     container_name: schema-migrator-async
@@ -67,3 +73,9 @@ services:
       schema-migrator-sync:
         condition: service_completed_successfully
     restart: on-failure
+    networks:
+      - signoz-dev-network
+
+networks:
+  signoz-dev-network:
+    external: true
diff --git a/.devenv/docker/signoz-otel-collector/compose.yaml b/.devenv/docker/signoz-otel-collector/compose.yaml
index 62a931b38de5..45c50d1323b5 100644
--- a/.devenv/docker/signoz-otel-collector/compose.yaml
+++ b/.devenv/docker/signoz-otel-collector/compose.yaml
@@ -25,5 +25,11 @@ services:
       timeout: 5s
       retries: 3
     restart: unless-stopped
+    networks:
+      - signoz-dev-network
     extra_hosts:
-      - "host.docker.internal:host-gateway"
\ No newline at end of file
+      - "host.docker.internal:host-gateway"
+
+networks:
+  signoz-dev-network:
+    external: true
\ No newline at end of file
diff --git a/.devenv/docker/signoz-otel-collector/otel-collector-config.yaml b/.devenv/docker/signoz-otel-collector/otel-collector-config.yaml
index 43a888fffb79..577fd638d808 100644
--- a/.devenv/docker/signoz-otel-collector/otel-collector-config.yaml
+++ b/.devenv/docker/signoz-otel-collector/otel-collector-config.yaml
@@ -60,13 +60,13 @@ extensions:
 
 exporters:
   clickhousetraces:
-    datasource: tcp://host.docker.internal:9000/signoz_traces
+    datasource: tcp://clickhouse:9000/signoz_traces
     low_cardinal_exception_grouping: ${env:LOW_CARDINAL_EXCEPTION_GROUPING}
     use_new_schema: true
   signozclickhousemetrics:
-    dsn: tcp://host.docker.internal:9000/signoz_metrics
+    dsn: tcp://clickhouse:9000/signoz_metrics
   clickhouselogsexporter:
-    dsn: tcp://host.docker.internal:9000/signoz_logs
+    dsn: tcp://clickhouse:9000/signoz_logs
     timeout: 10s
     use_new_schema: true
 
diff --git a/Makefile b/Makefile
index 415dc82385d1..c78bd3ba891f 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,7 @@ help: ## Displays help.
 ##############################################################
 .PHONY: devenv-clickhouse
 devenv-clickhouse: ## Run clickhouse in devenv
+	@docker network create signoz-dev-network 2>/dev/null || true
 	@cd .devenv/docker/clickhouse; \
 	docker compose -f compose.yaml up -d
 
@@ -63,6 +64,7 @@ devenv-postgres: ## Run postgres in devenv
 
 .PHONY: devenv-signoz-otel-collector
 devenv-signoz-otel-collector: ## Run signoz-otel-collector in devenv (requires clickhouse to be running)
+	@docker network create signoz-dev-network 2>/dev/null || true
 	@cd .devenv/docker/signoz-otel-collector; \
 	docker compose -f compose.yaml up -d