diff --git a/cli/config/compose/services/elastic-agent/docker-compose.yml b/cli/config/compose/services/elastic-agent/docker-compose.yml
index 58fa584642..b8c560f71a 100644
--- a/cli/config/compose/services/elastic-agent/docker-compose.yml
+++ b/cli/config/compose/services/elastic-agent/docker-compose.yml
@@ -9,13 +9,12 @@ services:
       kibana:
         condition: service_healthy
     environment:
-      - "KIBANA_HOST=http://${kibanaHost:-kibana}:${kibanaPort:-5601}"
+      - "FLEET_SERVER_ELASTICSEARCH_HOST=http://${elasticsearchHost:-elasticsearch}:${elasticsearchPort:-9200}"
       - "FLEET_SERVER_ENABLE=${fleetServerMode:-0}"
       - "FLEET_SERVER_INSECURE_HTTP=${fleetServerMode:-0}"
-      - "KIBANA_FLEET_SETUP=${fleetServerMode:-0}"
       - "FLEET_SERVER_HOST=0.0.0.0"
-      - "KIBANA_USERNAME=elastic"
-      - "KIBANA_PASSWORD=changeme"
+      - "FLEET_SERVER_ELASTICSEARCH_USERNAME=elastic"
+      - "FLEET_SERVER_ELASTICSEARCH_PASSWORD=changeme"
     platform: ${elasticAgentPlatform:-linux/amd64}
     ports:
       - "127.0.0.1:8220:8220"
diff --git a/e2e/_suites/fleet/features/stand_alone_agent.feature b/e2e/_suites/fleet/features/stand_alone_agent.feature
index 78af314844..171705c957 100644
--- a/e2e/_suites/fleet/features/stand_alone_agent.feature
+++ b/e2e/_suites/fleet/features/stand_alone_agent.feature
@@ -60,3 +60,8 @@ Scenario Outline: Deploying a <image> stand-alone agent with fleet server mode
 Examples: default
   | image   |
   | default |
+
+@ubi8
+Examples: Ubi8
+  | image   |
+  | ubi8    |