diff --git a/docker-compose.yml b/docker-compose.yml
index eefca7db3..371f982dc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,6 @@ services:
     ports:
       - "8222:8222"
       - "4222:4222"
-    restart: unless-stopped
     container_name: nats
     volumes:
       - ./datastore:/datastore
@@ -20,7 +19,6 @@ services:
       - "5423:5432"
     volumes:
       - ./analytics_pgdata:/var/lib/postgresql/data
-    restart: unless-stopped
     container_name: oodi_analytics_db
     environment:
       - POSTGRES_USER=postgres
@@ -32,7 +30,6 @@ services:
       - "5422:5432"
     volumes:
       - ./user_pgdata:/var/lib/postgresql/data
-    restart: unless-stopped
     container_name: oodi_user_db
     environment:
       - POSTGRES_USER=postgres
@@ -43,7 +40,6 @@ services:
       - "5424:5432"
     volumes:
       - ./usage_pgdata:/var/lib/postgresql/data
-    restart: unless-stopped
     container_name: oodi_usage_db
     environment:
       - POSTGRES_USER=postgres
@@ -56,7 +52,6 @@ services:
     volumes:
       - ./pgdata:/var/lib/postgresql/data
       - ./scripts/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d:ro
-    restart: unless-stopped
     container_name: oodi_db
     environment:
       - POSTGRES_USER=postgres
@@ -68,7 +63,6 @@ services:
     volumes:
       - ./pgdata_kone:/var/lib/postgresql/data
       - ./scripts/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d:ro
-    restart: unless-stopped
     container_name: db_kone
     environment:
       - POSTGRES_MULTIPLE_DATABASES=db_kone
@@ -81,7 +75,6 @@ services:
       - "6379:6379"
     volumes:
       - ./redis-data:/data
-    restart: unless-stopped
     container_name: redis
 
   backend:
@@ -105,7 +98,6 @@ services:
       ANALYTICS_URL: http://analytics:4568
       NATS_URI: nats://nats:4222
       UPDATER_URL: http://updater_scheduler:3678
-    restart: unless-stopped
     container_name: backend
     depends_on:
       - db
@@ -118,7 +110,6 @@ services:
     environment:
       BACKEND_ADDR: backend
       ADMINER_URL: http://localhost:5050/?pgsql=db&username=postgres
-    restart: unless-stopped
     container_name: frontend
 
   userservice:
@@ -133,7 +124,6 @@ services:
       TOKEN_SECRET: IWannaBeTheVeryBest
     depends_on:
       - user_db
-    restart: unless-stopped
     container_name: userservice
 
   usageservice:
@@ -147,7 +137,6 @@ services:
       SECRET: Luukk4inenApprov3dVitunMinttuSalainenAvain666NurmivaaraPJ2019
     depends_on:
       - usage_db
-    restart: unless-stopped
     container_name: usageservice
 
   updater_api:
@@ -159,7 +148,6 @@ services:
       - NATS_URI=nats://nats:4222
       - OODI_ADDR=https://oodikone.cs.helsinki.fi/oodi
       - TOKEN=jotaindiibadaabaa
-    restart: unless-stopped
     #container_name: updater_api
 
   updater_writer:
@@ -174,7 +162,6 @@ services:
       DB_URL: postgres://postgres@db:5432/tkt_oodi
       TEST_DB: postgres://postgres@db:5432/tkt_oodi_test
       TEST_DB_SCHEMA: updater_test
-    restart: unless-stopped
     #container_name: updater_writer
 
   scheduler_mongo:
@@ -183,7 +170,6 @@ services:
       - ./mongodata:/data/db
     expose:
       - "27017"
-    restart: unless-stopped
     container_name: scheduler_mongo
 
   updater_scheduler:
@@ -196,7 +182,6 @@ services:
       - NATS_URI=nats://nats:4222
       - MONGO_URI=mongodb://scheduler_mongo:27017
       - PORT=3678
-    restart: unless-stopped
     container_name: updater_scheduler
 
   analytics:
@@ -209,5 +194,4 @@ services:
       - TEST_DB=postgres://postgres@analytics_db:5432/analytics_db_test
     depends_on:
       - analytics_db
-    restart: unless-stopped
     container_name: analytics
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index d1e9e7a81..fe54092c9 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -4,10 +4,12 @@ services:
   user_db:
     environment:
       - POSTGRES_MULTIPLE_DATABASES=user_db,user_db_real
+    restart: unless-stopped
 
   db:
     environment:
       - POSTGRES_MULTIPLE_DATABASES=tkt_oodi,tkt_oodi_test,tkt_oodi_real
+    restart: unless-stopped
 
   backend:
     build:
@@ -21,6 +23,7 @@ services:
       - ./services/backend/shared/models:/usr/src/app/src/models
       - ./services/backend/shared/migrations:/usr/src/app/src/database/migrations
       - ./services/backend/shared/migrations_kone:/usr/src/app/src/database/migrations_kone
+    restart: unless-stopped
 
   frontend:
     build:
@@ -37,6 +40,7 @@ services:
       KONE_ADMINER_URL: http://localhost:5050/?pgsql=db_kone&username=postgres
     volumes:
       - ./services/oodikone2-frontend/:/usr/src/app
+    restart: unless-stopped
 
   userservice:
     build:
@@ -45,6 +49,7 @@ services:
     command: ['sh', '-c', 'cp -r /usr/src/cache/node_modules/. /usr/src/app/node_modules/ && npm run dev']
     volumes:
       - ./services/oodikone2-userservice/:/usr/src/app
+    restart: unless-stopped
 
   usageservice:
     build:
@@ -53,6 +58,7 @@ services:
     command: ['sh', '-c', 'cp -r /usr/src/cache/node_modules/. /usr/src/app/node_modules/ && npm run dev']
     volumes:
       - ./services/oodikone2-usageservice/:/usr/src/app
+    restart: unless-stopped
 
   updater_api:
     build:
@@ -61,6 +67,7 @@ services:
     command: ['sh', '-c', 'cp -r /usr/src/cache/node_modules/. /usr/src/app/node_modules/ && npm run dev']
     volumes:
       - ./services/updater_api/:/usr/src/app
+    restart: unless-stopped
 
   updater_writer:
     build:
@@ -74,6 +81,7 @@ services:
       - ./services/backend/shared/migrations_kone:/usr/src/app/database/migrations_kone
     environment:
       DB_SCHEMA_KONE: kone_data
+    restart: unless-stopped
 
   updater_scheduler:
     build:
@@ -82,6 +90,7 @@ services:
     command: ['sh', '-c', 'cp -r /usr/src/cache/node_modules/. /usr/src/app/node_modules/ && npm run dev']
     volumes:
       - ./services/updater_scheduler/:/usr/src/app
+    restart: unless-stopped
 
   analytics:
     build:
@@ -90,6 +99,7 @@ services:
     command: ['sh', '-c', 'cp -r /usr/src/cache/node_modules/. /usr/src/app/node_modules/ && npm run dev']
     volumes:
       - ./services/oodikone2-analytics/:/usr/src/app
+    restart: unless-stopped
 
   adminer:
     image: adminer:4.6.2
@@ -100,6 +110,7 @@ services:
     ports:
       - 5050:8080
     container_name: adminer
+    restart: unless-stopped
 
   # zookeeper:
   #   image: wurstmeister/zookeeper