diff --git a/docker/atlassian.yml b/docker/atlassian.yml
index 592f282eb790..91e94d7539ac 100644
--- a/docker/atlassian.yml
+++ b/docker/atlassian.yml
@@ -11,7 +11,7 @@ services:
         image: ghcr.io/ls1intum/artemis-jira:9.4.3
         pull_policy: always
         volumes:
-          - artemis-jira-data:/var/atlassian/application-data/jira
+            - artemis-jira-data:/var/atlassian/application-data/jira
         ports:
             - "8081:8080"
         # expose the port to make it reachable docker internally even if the external port mapping changes
@@ -57,6 +57,12 @@ services:
             - "8085"
         networks:
             - artemis
+        healthcheck:
+            test: curl -f http://localhost:8085/rest/api/latest/server | grep "<state>RUNNING</state>"
+            interval: 10s
+            timeout: 5s
+            start_period: 40s
+            retries: 120 # = 20 minutes startup time during setup
 
     bamboo-build-agent:
         container_name: artemis-bamboo-build-agent
@@ -74,6 +80,9 @@ services:
             BAMBOO_SERVER: "http://bamboo:8085"
         networks:
             - artemis
+        depends_on:
+            bamboo:
+                condition: service_healthy
 
 networks:
     artemis: