diff --git a/Dockerfile b/Dockerfile
index 9f816a58108abb2c55139f3cd2d53528929e30cc..8734e3172be3990e022329347601551962a471ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 0, based on Node.js, to build and compile Angular
-FROM node:8.10.0
+FROM node:12.13-slim
 
 # Copy the package.json file first in order to cache the modules
 COPY ./package.json /app/package.json
diff --git a/docker-compose.yml b/docker-compose.yml
index a74a8da97f48a85245513a3214bb53bf362f4492..0c7320bd038097e185d90dae262e327e473ac9b2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
       - PROXY_HOST_TARGET=${PROXY_HOST_TARGET}
     depends_on:
       - redis-sentinel-1
+    restart: unless-stopped
 
   redis-master:
     image: 'bitnami/redis:latest'
@@ -26,6 +27,7 @@ services:
       - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - redis-master:/bitnami/redis/data
+    restart: unless-stopped
 
   redis-sentinel-1:
     image: 'bitnami/redis-sentinel:latest'
@@ -34,6 +36,7 @@ services:
       - REDIS_MASTER_SET=mymaster
     volumes:
       - redis-sentinel-1:/bitnami/redis/data
+    restart: unless-stopped
 
   redis-slave-1:
     image: 'bitnami/redis:latest'
@@ -42,6 +45,7 @@ services:
       - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - redis-slave-1:/bitnami/redis/data
+    restart: unless-stopped
 
 volumes:
   redis-master: