diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f5555c..c27ed4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,16 +41,19 @@ build-book:
   script:
     - docker build -t $TAG_LATEST .
     - docker push $TAG_LATEST
+    - docker image prune -f
 
 deploy-book:
   stage: deploy
   image: docker
   rules:
     - if: $CI_COMMIT_BRANCH == "publish" && $CI_PIPELINE_SOURCE == "push"
+  before_script:
+    - docker info
+    - docker stop $CI_PROJECT_NAME || exit_code=$?
+    - if [ $exit_code -ne 0 ]; then echo "Container $CI_PROJECT_NAME not found, cannot stop"; else docker rm $CI_PROJECT_NAME; fi
   script:
-    - docker stop $CI_PROJECT_NAME
-    - docker rm $CI_PROJECT_NAME
-    - docker run -d -p 8000:8000 --name $CI_PROJECT_NAME $TAG_LATEST
+    - docker run -d --restart always -p 8000:8000 --name $CI_PROJECT_NAME $TAG_LATEST
   environment:
     name: production
     url: https://interactivetextbooks.citg.tudelft.nl/$CI_PROJECT_NAME
\ No newline at end of file