diff --git a/docker-compose.yml b/docker-compose.yml
index 6233670..382fd16 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,7 @@ services:
     volumes:
       - ./nginx_conf.d:/etc/nginx/user_conf.d
       - ./letsencrypt:/etc/letsencrypt
+    restart: unless-stopped
     ports:
       #- "80:80"
       #- "443:443"
@@ -20,6 +21,7 @@ services:
     build:
       context: ./treetalker/nodejs
       dockerfile: ../../docker/Dockerfile.backend
+    restart: unless-stopped
     ports:
       - "127.0.0.1:3010:3010"
 
@@ -27,6 +29,7 @@ services:
     build:
       context: ./init_db
       dockerfile: ../docker/Dockerfile.db
+    restart: unless-stopped
     environment:
       POSTGRES_PASSWORD: "toCHANGE" # TODO: change to real password
     volumes:
@@ -36,13 +39,15 @@ services:
 
   ppga:
     image: "bitnami/phppgadmin:7.13.0"
-      environment:
-        DATABASE_HOST: "db"
-        DATABASE_PORT_NUMBER: "5432"
+    restart: unless-stopped
+    environment:
+      DATABASE_HOST: "db"
+      DATABASE_PORT_NUMBER: "5432"
 
   martin:
     image: "urbica/martin:pr-360"
     environment:
       DATABASE_URL: "postgres://postgres:toCHANGE@db/spatial" # TODO: change to real password
+    restart: unless-stopped
     ports:
       - "3000:3000"