diff --git a/charts/primary-site/templates/deployments/stream-service.yaml b/charts/primary-site/templates/deployments/stream-service.yaml
index 259685e..61821bc 100644
--- a/charts/primary-site/templates/deployments/stream-service.yaml
+++ b/charts/primary-site/templates/deployments/stream-service.yaml
@@ -40,7 +40,9 @@ spec:
       {{- end }}
       containers:
         - name: stream-service
-          image: {{ .Values.streamService.deployment.image }}:{{ .Chart.AppVersion }}
+          ## If the betaOptOut flag is enabled, fall back to the legacy stream server image
+          {{- $image := ternary "legacyImage" "image" .Values.streamService.betaOptOut }}
+          image: {{ index .Values.streamService.deployment $image }}:{{ .Chart.AppVersion }}
           resources:
             requests:
               cpu: {{ .Values.streamService.deployment.resources.requests.cpu }}
diff --git a/charts/primary-site/values.yaml b/charts/primary-site/values.yaml
index 3711903..853cb58 100644
--- a/charts/primary-site/values.yaml
+++ b/charts/primary-site/values.yaml
@@ -133,10 +133,13 @@ inboxListener:
     pollingInterval: 30
 
 streamService:
+  # This chart defaults to a new version of the stream server. To disable this set the `betaOptOut` flag to true.
+  betaOptOut: false
   service:
     annotations: {}
   deployment:
-    image: "us-central1-docker.pkg.dev/foxglove-images/images/stream-server"
+    image: "us-central1-docker.pkg.dev/foxglove-images/images/beta-stream-server"
+    legacyImage: "us-central1-docker.pkg.dev/foxglove-images/images/stream-server"
     replicas: 1
     initContainers: []
     extraVolumes: []