diff --git a/ansible/roles/concourse/docker-compose.yml.j2 b/ansible/roles/concourse/docker-compose.yml.j2
index ce9083b..ea3979e 100644
--- a/ansible/roles/concourse/docker-compose.yml.j2
+++ b/ansible/roles/concourse/docker-compose.yml.j2
@@ -4,6 +4,7 @@ version: '3'
 services:
   concourse-db:
     image: postgres
+    restart: always
     environment:
       POSTGRES_DB: concourse
       POSTGRES_PASSWORD: {{ postgres_password }}
@@ -14,6 +15,7 @@ services:
 
   concourse:
     image: concourse/concourse
+    restart: always
     command: quickstart
     privileged: true
     depends_on: [concourse-db]
@@ -25,7 +27,7 @@ services:
       CONCOURSE_POSTGRES_DATABASE: concourse
       CONCOURSE_EXTERNAL_URL: https://concourse.pim.kunis.nl:444
       CONCOURSE_ADD_LOCAL_USER: admin:{{ admin_password }}
-      CONCOURSE_MAIN_TEAM_LOCAL_USER: test
+      CONCOURSE_MAIN_TEAM_LOCAL_USER: admin
       # instead of relying on the default "detect"
       CONCOURSE_WORKER_BAGGAGECLAIM_DRIVER: overlay
       CONCOURSE_CLIENT_SECRET: {{ client_secret }}