diff --git a/Dockerfile-dangerous b/Dockerfile-dangerous
index 373e33cf138..431c61db03f 100644
--- a/Dockerfile-dangerous
+++ b/Dockerfile-dangerous
@@ -7,6 +7,6 @@ RUN go get github.com/Masterminds/glide
 RUN glide install
 RUN go install github.com/ory-am/hydra
 
-ENTRYPOINT sleep 5; /go/bin/hydra host --dangerous-auto-logon
+ENTRYPOINT /go/bin/hydra host --dangerous-auto-logon
 
 EXPOSE 4444
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 5934d7c8b42..32cf22c9af7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,7 @@ services:
       - SYSTEM_SECRET=${SYSTEM_SECRET}
       - CONSENT_URL=http://${DOCKER_IP}:3000
       - DATABASE_URL=rethinkdb://database:28015/hydra
+    restart: unless-stopped
 
   consent:
     environment:
@@ -28,6 +29,7 @@ services:
       - hydravolume:/root
     ports:
       - "3000:3000"
+    restart: unless-stopped
 
   rethinkdb:
       image: rethinkdb