diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74ba521..c6f18ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,6 +103,8 @@ build-backend-image:
     - docker push $CI_DOCKER_REGISTRY_REPO:backend
   rules:
     - if: $CI_COMMIT_BRANCH == "main"
+      changes:
+        - backend/**/*
 
 build-frontend-image:
   stage: oci-build
@@ -124,6 +126,8 @@ build-frontend-image:
     - docker push $CI_DOCKER_REGISTRY_REPO:frontend
   rules:
     - if: $CI_COMMIT_BRANCH == "main"
+      changes:
+        - frontend/**/*
 
 deploy-all:
   stage: deploy
@@ -145,8 +149,5 @@ deploy-all:
       "cd /home/$CI_SSH_USER/docker/htwkalender/ &&
       docker login -u $CI_DOCKER_REGISTRY_USER -p $CI_DOCKER_REGISTRY_PASSWORD $CI_DOCKER_REGISTRY &&
       docker compose -f ./docker-compose.prod.yml down && docker compose -f ./docker-compose.prod.yml up -d --remove-orphans && docker logout"
-  needs:
-    - build-frontend-image
-    - build-backend-image
   rules:
     - if: $CI_COMMIT_BRANCH == "main"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index fec8a95..47e4ea4 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -5,6 +5,7 @@ services:
     image: DOCKER_REGISTRY_REPO:backend # DOCKER_REGISTRY_REPO will be replaced by CI
     command: "--http=0.0.0.0:8090 --dir=/htwkalender/data/pb_data"
     pull_policy: always
+    restart: always
     # open port 8090
     ports:
       - "8090:8090"
@@ -14,6 +15,7 @@ services:
   htwkalender-frontend:
     image: DOCKER_REGISTRY_REPO:frontend # DOCKER_REGISTRY_REPO will be replaced by CI
     pull_policy: always
+    restart: always
     ports:
       - "8000:8000"
     depends_on:
@@ -21,6 +23,7 @@ services:
 
   rproxy:
     image: bitnami/nginx:1.25
+    restart: always
     volumes:
       - ./reverseproxy.conf:/opt/bitnami/nginx/conf/nginx.conf
     depends_on: