diff --git a/docker/development.env b/docker/development.env
index 44202a2c501..279b2d4ceb8 100644
--- a/docker/development.env
+++ b/docker/development.env
@@ -15,6 +15,7 @@ BASE64_WEDLOCKS_PRIVATE_KEY=pk
 POSTGRES_USER=graph-node
 POSTGRES_PASSWORD=let-me-in
 POSTGRES_DB=graph-node
+POSTGRES_INITDB_ARGS="-E UTF8 --locale=C" # required by graph-node since 0.30.0
 
 # for subgraph config
 postgres_host=postgres
diff --git a/docker/docker-compose.integration.yml b/docker/docker-compose.integration.yml
index c9d5af3e4a8..a489e19dce0 100644
--- a/docker/docker-compose.integration.yml
+++ b/docker/docker-compose.integration.yml
@@ -37,7 +37,7 @@ services:
       [
         '/opt/wait-for-it.sh',
         '-t',
-        '0',
+        '600',
         'graph-node:8020',
         '--',
         'sh',
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index d739a737b4b..0ea67a791f2 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.2'
 services:
   graph-node:
-    image: graphprotocol/graph-node:v0.29.0
+    image: graphprotocol/graph-node:v0.34.1
     ports:
       - '8000:8000'
       - '8001:8001'
diff --git a/docker/integration-graph-node.env b/docker/integration-graph-node.env
index 8adeb776fef..153f2ee8696 100644
--- a/docker/integration-graph-node.env
+++ b/docker/integration-graph-node.env
@@ -4,4 +4,5 @@ postgres_pass=password
 postgres_db=locksmith_test
 ipfs=ipfs:5001
 ethereum=mainnet:http://eth-node:8545
-RUST_LOG=info
\ No newline at end of file
+RUST_LOG=info
+POSTGRES_INITDB_ARGS="-E UTF8 --locale=C" # required by graph-node since 0.30.0