diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index 67b5c91a..75fb2db3 100644
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -13,8 +13,9 @@ services:
       - RABBITMQ_CONFIG_FILE=/etc/pitstop/rabbitmq.conf
 
   sqlserver:
-    image: mcr.microsoft.com/mssql/server:2022-latest
+    image: mcr.microsoft.com/mssql/server:2019-latest
     container_name: sqlserver
+    restart: unless-stopped
     volumes:
       - ./.containerdata/sqlserver/mssql:/var/opt/mssql
       - ./.containerdata/sqlserver/data:/var/opt/mssql/data
@@ -47,6 +48,7 @@ services:
   vehiclemanagementapi:
     image: pitstop/vehiclemanagementapi:1.0
     build: VehicleManagementAPI
+    restart: unless-stopped
     depends_on:
       - rabbitmq
       - sqlserver
@@ -58,6 +60,7 @@ services:
   customermanagementapi:
     image: pitstop/customermanagementapi:1.0
     build: CustomerManagementAPI
+    restart: unless-stopped
     depends_on:
       - rabbitmq
       - sqlserver
@@ -90,6 +93,7 @@ services:
     image: pitstop/invoiceservice:1.0
     build: InvoiceService
     container_name: invoiceservice
+    restart: unless-stopped
     depends_on:
       - rabbitmq
       - sqlserver
@@ -101,6 +105,7 @@ services:
     image: pitstop/notificationservice:1.0
     build: NotificationService
     container_name: notificationservice
+    restart: unless-stopped
     depends_on:
       - rabbitmq
       - sqlserver
@@ -121,6 +126,7 @@ services:
     image: pitstop/workshopmanagementeventhandler:1.0
     build: WorkshopManagementEventHandler
     container_name: workshopmanagementeventhandler
+    restart: unless-stopped
     depends_on:
       - rabbitmq
       - sqlserver