diff --git a/docker/Dockerfile b/docker/Dockerfile
index a002857ab15f33b87424732721ad301daaad10c0..6dd60b89ab8534e0f1ee58740fd4f434247a9c8e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -52,6 +52,5 @@ ENV PYTHONPATH .
 EXPOSE 9080
 EXPOSE 9443
 
-# Sleep as postgres take a bit of time to start. HACK ON.
-ENTRYPOINT sleep 3 ; twistd -ny opennsa.tac
+ENTRYPOINT rm -f twistd.pid; twistd -ny opennsa.tac
 
diff --git a/docker/template.yml b/docker/template.yml
index a50aa194c49940042c467ec05033252840984133..f5d4a46936057342d1472b39d2ad19fe9f6139a0 100644
--- a/docker/template.yml
+++ b/docker/template.yml
@@ -16,6 +16,7 @@ services:
     image: opennsa:latest
     depends_on:
       - opennsa-db
+      - waitforpg
     ports:
       - 127.0.0.1:9080:9080
       - 127.0.0.1:9443:9443
@@ -26,6 +27,12 @@ services:
       - ${OPENNSA_NRM_FILE}:/home/opennsa/opennsa/opennsa.nrm:ro
 
 
+  waitforpg:
+    image: dadarek/wait-for-dependencies
+    depends_on:
+      - opennsa-db
+    command: opennsa-db:5432
+
 volumes:
   opennsa-pgdata: