diff --git a/charts/orb/Chart.yaml b/charts/orb/Chart.yaml
index 24d32bc..8ddcea8 100644
--- a/charts/orb/Chart.yaml
+++ b/charts/orb/Chart.yaml
@@ -10,7 +10,7 @@ name: orb
 description: Orb Observability Platform
 icon: https://avatars1.githubusercontent.com/u/13207490
 type: application
-version: 1.0.5
+version: 1.0.6
 appVersion: "0.9.0"
 home: https://getorb.io
 sources:
diff --git a/charts/orb/templates/envoy.yaml b/charts/orb/templates/envoy.yaml
index 8a2c531..dcb5c4b 100644
--- a/charts/orb/templates/envoy.yaml
+++ b/charts/orb/templates/envoy.yaml
@@ -20,6 +20,60 @@ data:
                       - name: envoy.access_loggers.stdout
                         typed_config:
                           "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog
+        - name: fleet_grpc_listener
+          address:
+            socket_address:
+              address: 0.0.0.0
+              port_value: {{ .Values.fleet.grpcPort }}
+          filter_chains:
+            - filters:
+                - name: envoy.filters.network.http_connection_manager
+                  typed_config:
+                    "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
+                    access_log:
+                      - name: envoy.access_loggers.stdout
+                        typed_config:
+                          "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog
+                    stat_prefix: fleet
+                    codec_type: AUTO
+                    route_config:
+                      name: fleet_route
+                      virtual_hosts:
+                        - name: fleet_service
+                          domains: ["*"]
+                          routes:
+                            - match: { prefix: "/" }
+                              route: { cluster: fleet }
+                    http_filters:
+                      - name: envoy.filters.http.grpc_web
+                      - name: envoy.filters.http.router
+        - name: sinks_grpc_listener
+          address:
+            socket_address:
+              address: 0.0.0.0
+              port_value: {{ .Values.sinks.grpcPort }}
+          filter_chains:
+            - filters:
+                - name: envoy.filters.network.http_connection_manager
+                  typed_config:
+                    "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
+                    access_log:
+                      - name: envoy.access_loggers.stdout
+                        typed_config:
+                          "@type": type.googleapis.com/envoy.extensions.access_loggers.stream.v3.StdoutAccessLog
+                    stat_prefix: sinks
+                    codec_type: AUTO
+                    route_config:
+                      name: sinks_route
+                      virtual_hosts:
+                        - name: sinks_service
+                          domains: ["*"]
+                          routes:
+                            - match: { prefix: "/" }
+                              route: { cluster: sinks }
+                    http_filters:
+                      - name: envoy.filters.http.grpc_web
+                      - name: envoy.filters.http.router
         - name: policies_grpc_listener
           address:
             socket_address:
@@ -129,6 +183,34 @@ data:
                   socket_address:
                     address: {{ .Release.Name }}-auth-headless
                     port_value: {{ .Values.auth.grpcPort }}
+      - name: fleet
+        connect_timeout: 0.25s
+        type: strict_dns
+        lb_policy: round_robin
+        http2_protocol_options: {}
+        load_assignment:
+          cluster_name: fleet
+          endpoints:
+          - lb_endpoints:
+            - endpoint:
+                address:
+                  socket_address:
+                    address: {{ .Release.Name }}-fleet-headless
+                    port_value: {{ .Values.fleet.grpcPort }}
+      - name: sinks
+        connect_timeout: 0.25s
+        type: strict_dns
+        lb_policy: round_robin
+        http2_protocol_options: {}
+        load_assignment:
+          cluster_name: sinks
+          endpoints:
+          - lb_endpoints:
+            - endpoint:
+                address:
+                  socket_address:
+                    address: {{ .Release.Name }}-sinks-headless
+                    port_value: {{ .Values.sinks.grpcPort }}
       - name: policies
         connect_timeout: 0.25s
         type: strict_dns
@@ -219,6 +301,12 @@ spec:
     - port: {{ .Values.auth.grpcPort }}
       protocol: TCP
       name: auth-grpc
+    - port: {{ .Values.fleet.grpcPort }}
+      protocol: TCP
+      name: fleet-grpc
+    - port: {{ .Values.sinks.grpcPort }}
+      protocol: TCP
+      name: sinks-grpc
     - port: {{ .Values.policies.grpcPort }}
       protocol: TCP
       name: policies-grpc
diff --git a/charts/orb/templates/fleet-service.yaml b/charts/orb/templates/fleet-service.yaml
index b15b968..382622e 100644
--- a/charts/orb/templates/fleet-service.yaml
+++ b/charts/orb/templates/fleet-service.yaml
@@ -13,3 +13,20 @@ spec:
     - protocol: TCP
       port: {{ .Values.fleet.httpPort }}
       name: {{ .Release.Name }}-fleet-http
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-fleet-headless
+spec:
+  selector:
+    app: {{ .Release.Name }}
+    component: fleet
+  ports:
+    - port: {{ .Values.fleet.httpPort }}
+      protocol: TCP
+      name: {{ .Release.Name }}-fleet-{{ .Values.fleet.httpPort }}
+    - port: {{ .Values.fleet.grpcPort }}
+      protocol: TCP
+      name: {{ .Release.Name }}-fleet-{{ .Values.fleet.grpcPort }}
+  clusterIP: None
diff --git a/charts/orb/templates/sinks-service.yaml b/charts/orb/templates/sinks-service.yaml
index d270d85..db3e503 100644
--- a/charts/orb/templates/sinks-service.yaml
+++ b/charts/orb/templates/sinks-service.yaml
@@ -13,3 +13,20 @@ spec:
     - protocol: TCP
       port: {{ .Values.sinks.httpPort }}
       name: {{ .Release.Name }}-sinks-http
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-sinks-headless
+spec:
+  selector:
+    app: {{ .Release.Name }}
+    component: sinks
+  ports:
+    - port: {{ .Values.sinks.httpPort }}
+      protocol: TCP
+      name: {{ .Release.Name }}-sinks-{{ .Values.sinks.httpPort }}
+    - port: {{ .Values.sinks.grpcPort }}
+      protocol: TCP
+      name: {{ .Release.Name }}-sinks-{{ .Values.sinks.grpcPort }}
+  clusterIP: None