diff --git a/Makefile b/Makefile
index 80f67115..a300f08f 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ run-database: stop-database
 	docker volume create $(DB_VOLUME)
 	docker build -t $(DB_CONTAINER_NAME) .
 	docker run -d --name $(DB_CONTAINER_NAME) \
+		--restart=always \
 		-e POSTGRES_USER=$(DB_USER) \
 		-e POSTGRES_PASSWORD=$(DB_PASSWORD) \
 		-p $(DB_PORT):5432 \
diff --git a/docker-compose.yml b/docker-compose.yml
index a0485abf..a96bb452 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ version: '3'
 services:
   database:
     build: ./
+    restart: always
     env_file:
       - .env
     ports: