diff --git a/devenv/docker/blocks/elastic2/docker-compose.yaml b/devenv/docker/blocks/elastic2/docker-compose.yaml
index 23210b7b7d6..64107c3e1e6 100644
--- a/devenv/docker/blocks/elastic2/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic2/docker-compose.yaml
@@ -9,7 +9,7 @@
 
   fake-elastic-data:
     image: grafana/fake-data-gen
-    network_mode: bridge
     environment:
-      FD_DATASOURCE: elasticsearch2
+      FD_SERVER: elasticsearch2
+      FD_DATASOURCE: elasticsearch
       FD_PORT: 9200
diff --git a/devenv/docker/blocks/graphite/docker-compose.yaml b/devenv/docker/blocks/graphite/docker-compose.yaml
index 89122f32107..eb04bc6703e 100644
--- a/devenv/docker/blocks/graphite/docker-compose.yaml
+++ b/devenv/docker/blocks/graphite/docker-compose.yaml
@@ -7,7 +7,6 @@
 
   fake-graphite11-data:
     image: grafana/fake-data-gen
-    network_mode: bridge
     environment:
       FD_DATASOURCE: graphite
       FD_PORT: 2103
diff --git a/devenv/docker/blocks/graphite09/docker-compose.yaml b/devenv/docker/blocks/graphite09/docker-compose.yaml
index 8778dbfb638..abeb8183168 100644
--- a/devenv/docker/blocks/graphite09/docker-compose.yaml
+++ b/devenv/docker/blocks/graphite09/docker-compose.yaml
@@ -10,10 +10,7 @@
 
   fake-graphite09-data:
     image: grafana/fake-data-gen
-    network_mode: bridge
     environment:
       FD_DATASOURCE: graphite
       FD_PORT: 2303
       FD_GRAPHITE_VERSION: 0.9
-
-
diff --git a/devenv/docker/blocks/graphite1/docker-compose.yaml b/devenv/docker/blocks/graphite1/docker-compose.yaml
index e8a59f30761..ac5fb86a3d2 100644
--- a/devenv/docker/blocks/graphite1/docker-compose.yaml
+++ b/devenv/docker/blocks/graphite1/docker-compose.yaml
@@ -7,7 +7,6 @@
 
   fake-graphite1-data:
     image: grafana/fake-data-gen
-    network_mode: bridge
     environment:
       FD_DATASOURCE: graphite
       FD_PORT: 2203
diff --git a/devenv/docker/blocks/mssql/docker-compose.yaml b/devenv/docker/blocks/mssql/docker-compose.yaml
index 05a93629e73..becb4b321b9 100644
--- a/devenv/docker/blocks/mssql/docker-compose.yaml
+++ b/devenv/docker/blocks/mssql/docker-compose.yaml
@@ -13,7 +13,6 @@
 
   fake-mssql-data:
     image: grafana/fake-data-gen
-    network_mode: bridge
     environment:
       FD_DATASOURCE: mssql
-      FD_PORT: 1433
\ No newline at end of file
+      FD_PORT: 1433
diff --git a/devenv/docker/blocks/mysql/docker-compose.yaml b/devenv/docker/blocks/mysql/docker-compose.yaml
index d85f3db53ac..6a2083e1c7e 100644
--- a/devenv/docker/blocks/mysql/docker-compose.yaml
+++ b/devenv/docker/blocks/mysql/docker-compose.yaml
@@ -11,8 +11,6 @@
 
   fake-mysql-data:
     image: grafana/fake-data-gen
-    network_mode: bridge
     environment:
       FD_DATASOURCE: mysql
       FD_PORT: 3306
-
diff --git a/devenv/docker/blocks/opentsdb/docker-compose.yaml b/devenv/docker/blocks/opentsdb/docker-compose.yaml
index d366c9b1b30..97c46ae4d76 100644
--- a/devenv/docker/blocks/opentsdb/docker-compose.yaml
+++ b/devenv/docker/blocks/opentsdb/docker-compose.yaml
@@ -5,7 +5,7 @@
 
   fake-opentsdb-data:
     image: grafana/fake-data-gen
-    network_mode: bridge
     environment:
       FD_DATASOURCE: opentsdb
+      FD_PORT: 4242
 
diff --git a/devenv/docker/blocks/postgres/docker-compose.yaml b/devenv/docker/blocks/postgres/docker-compose.yaml
index 7dfffdc1238..58002e14d2a 100644
--- a/devenv/docker/blocks/postgres/docker-compose.yaml
+++ b/devenv/docker/blocks/postgres/docker-compose.yaml
@@ -15,7 +15,6 @@
 
   fake-postgres-data:
     image: grafana/fake-data-gen
-    network_mode: bridge
     environment:
       FD_DATASOURCE: postgres
       FD_PORT: 5432