diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index c842801..eafe7a3 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -37,7 +37,7 @@ steps:
       - pip install -r requirements.txt
       - cd ./src
       - python manage.py collectstatic --noinput
-      - python manage.py test functional_tests
+      - python manage.py test functional_tests --parallel
     when:
       - event: push
 
diff --git a/infra/deploy-playbook.yaml b/infra/deploy-playbook.yaml
index 69e682f..a4ffb2b 100644
--- a/infra/deploy-playbook.yaml
+++ b/infra/deploy-playbook.yaml
@@ -129,6 +129,7 @@
         image: gitea.earthmanrpg.me/discoman/gamearray:latest
         state: started
         recreate: true
+        restart_policy: unless-stopped
         env:
           DJANGO_DEBUG_FALSE: "1"
           DJANGO_SECRET_KEY: "{{ secret_key.content | b64decode }}"
@@ -150,6 +151,7 @@
         image: gitea.earthmanrpg.me/discoman/gamearray:latest
         state: started
         recreate: true
+        restart_policy: unless-stopped
         env:
           DJANGO_DEBUG_FALSE: "1"
           DJANGO_SECRET_KEY: "{{ secret_key.content | b64decode }}"
diff --git a/infra/deploy.sh.j2 b/infra/deploy.sh.j2
index 57b8b08..8bb9f39 100644
--- a/infra/deploy.sh.j2
+++ b/infra/deploy.sh.j2
@@ -12,6 +12,7 @@ docker rm gamearray 2>/dev/null || true
 
 echo "==> Starting new container..."
 docker run -d --name gamearray \
+    --restart unless-stopped \
     --env-file /opt/gamearray/gamearray.env \
     --network gamearray_net \
     -p 127.0.0.1:8888:8888 \
@@ -23,6 +24,7 @@ docker rm gamearray_celery 2>/dev/null || true
 
 echo "==> Starting new celery worker..."
 docker run -d --name gamearray_celery \
+    --restart unless-stopped \
     --env-file /opt/gamearray/gamearray.env \
     --network gamearray_net \
     "$IMAGE" python -m celery -A core worker -l info