diff --git a/.env b/.env
index 1e4c83dffd..a0696e1a0d 100644
--- a/.env
+++ b/.env
@@ -129,12 +129,12 @@ SHIPPING_SERVICE_DOCKERFILE=./src/shippingservice/Dockerfile
 # ******************
 # Dependent Services
 # ******************
-# flagd
+# Flagd
 FLAGD_HOST=flagd
 FLAGD_PORT=8013
 
-#flagd-ui
-FLAGD_UI_HOST=flagd-ui
+# Flagd UI
+FLAGD_UI_HOST=flagdui
 FLAGD_UI_PORT=4000
 FLAGD_UI_DOCKERFILE=./src/flagd-ui/Dockerfile
 
diff --git a/docker-compose.yml b/docker-compose.yml
index d0f52dccf7..23e47d10a0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -357,7 +357,7 @@ services:
         condition: service_started
       grafana:
         condition: service_started
-      flagd-ui:
+      flagdui:
         condition: service_started
 
   # Imageprovider
@@ -607,10 +607,10 @@ services:
     logging:
       *logging
 
-  # Flagd-ui, UI for configuring the feature flagging service
-  flagd-ui:
-    image: ${IMAGE_NAME}:${DEMO_VERSION}-flagd-ui
-    container_name: flagd-ui
+  # Flagd UI for configuring the feature flag service
+  flagdui:
+    image: ${IMAGE_NAME}:${DEMO_VERSION}-flagdui
+    container_name: flagdui
     build:
       context: ./
       dockerfile: ${FLAGD_UI_DOCKERFILE}
@@ -623,7 +623,7 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP}
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
-      - OTEL_SERVICE_NAME=flagd-ui
+      - OTEL_SERVICE_NAME=flagdui
     ports:
       - "${FLAGD_UI_PORT}"
     depends_on:
diff --git a/src/frontendproxy/envoy.tmpl.yaml b/src/frontendproxy/envoy.tmpl.yaml
index dd19fc4bc8..81c2f28a16 100644
--- a/src/frontendproxy/envoy.tmpl.yaml
+++ b/src/frontendproxy/envoy.tmpl.yaml
@@ -50,7 +50,7 @@ static_resources:
                         - match: { prefix: "/flagservice/" }
                           route: { cluster: flagservice, prefix_rewrite: "/", timeout: 0s }
                         - match: { prefix: "/feature" }
-                          route: { cluster: flagd-ui }
+                          route: { cluster: flagdui }
                         - match: { prefix: "/" }
                           route: { cluster: frontend }
                 http_filters:
@@ -132,11 +132,11 @@ static_resources:
                     socket_address:
                       address: ${FLAGD_HOST}
                       port_value: ${FLAGD_PORT}
-    - name: flagd-ui
+    - name: flagdui
       type: STRICT_DNS
       lb_policy: ROUND_ROBIN
       load_assignment:
-        cluster_name: flagd-ui
+        cluster_name: flagdui
         endpoints:
           - lb_endpoints:
               - endpoint: