diff --git a/docker-compose.yml b/docker-compose.yml
index 4d9cb007..39f9096b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,12 +3,14 @@ services:
   postgres:
     container_name: clair_postgres
     image: postgres:latest
+    restart: unless-stopped
     environment:
       POSTGRES_PASSWORD: password
 
   clair:
     container_name: clair_clair
     image: quay.io/coreos/clair:v1.2.2
+    restart: unless-stopped
     depends_on:
       - postgres
     ports: