diff --git a/devenv/docker/blocks/postgres/docker-compose.yaml b/devenv/docker/blocks/postgres/docker-compose.yaml
index 3628c4d6771..7dfffdc1238 100644
--- a/devenv/docker/blocks/postgres/docker-compose.yaml
+++ b/devenv/docker/blocks/postgres/docker-compose.yaml
@@ -1,4 +1,4 @@
-  postgrestest:
+  postgres:
     image: postgres:${postgres_version}
     environment:
       POSTGRES_USER: grafana
@@ -7,6 +7,11 @@
     ports:
       - "5432:5432"
     command: postgres -c log_connections=on -c logging_collector=on -c log_destination=stderr -c log_directory=/var/log/postgresql
+    healthcheck:
+      test: [ "CMD", "pg_isready", "-q", "-d", "$$POSTGRES_DATABASE", "-U", "$$POSTGRES_USER" ]
+      timeout: 45s
+      interval: 10s
+      retries: 10
 
   fake-postgres-data:
     image: grafana/fake-data-gen
@@ -14,3 +19,6 @@
     environment:
       FD_DATASOURCE: postgres
       FD_PORT: 5432
+    depends_on:
+      postgres:
+        condition: service_healthy
diff --git a/devenv/docker/compose_header.yml b/devenv/docker/compose_header.yml
index e7bf4f38b02..1d50f0aff6a 100644
--- a/devenv/docker/compose_header.yml
+++ b/devenv/docker/compose_header.yml
@@ -1,2 +1,2 @@
-version: "2"
+version: "2.1"
 services: