diff --git a/extensions/fleet/README.md b/extensions/fleet/README.md
index fa3f42d..c74e7e0 100644
--- a/extensions/fleet/README.md
+++ b/extensions/fleet/README.md
@@ -13,10 +13,6 @@ Fleet Server is the central component which allows connecting Elastic Agents to
 
 ## Usage
 
-> **Note**  
-> Elastic Agent does not retry failed connections to Kibana upon the initial enrollment phase. Therefore, Kibana must be
-> fully started before this extension can be run.
-
 To include Fleet Server in the stack, run Docker Compose from the root of the repository with an additional command line
 argument referencing the `fleet-compose.yml` file:
 
diff --git a/extensions/fleet/fleet-compose.yml b/extensions/fleet/fleet-compose.yml
index bb4080e..81c0a39 100644
--- a/extensions/fleet/fleet-compose.yml
+++ b/extensions/fleet/fleet-compose.yml
@@ -19,6 +19,8 @@ services:
     ports:
       - '8220:8220'
     hostname: fleet-server
+    # Elastic Agent does not retry failed connections to Kibana upon the initial enrollment phase.
+    restart: on-failure
     networks:
       - elk
     depends_on: