diff --git a/.drone.yml b/.drone.yml
index 2179da8..6dc7053 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -109,7 +109,7 @@ steps:
         - docker pull khwezi/webapitest:latest
         - docker stop webapitest || true
         - docker rm webapitest || true
-        - docker run -d --name webapitest -e ASPNETCORE_ENVIRONMENT=Development -p 4000:8081 khwezi/webapitest:latest
+        - docker run -d --name webapitest --restart unless-stopped -e ASPNETCORE_ENVIRONMENT=Development -p 4000:8081 khwezi/webapitest:latest
 
 ---
 kind: pipeline
@@ -136,7 +136,7 @@ steps:
       script:
         - docker stop webapi || true
         - docker rm webapi || true
-        - docker run -d --name webapi -e ASPNETCORE_ENVIRONMENT=Production -p 4001:8081 khwezi/webapitest:latest
+        - docker run -d --name webapi --restart unless-stopped -e ASPNETCORE_ENVIRONMENT=Production -p 4001:8081 khwezi/webapitest:latest
     when:
       event:
         - promote