diff --git a/charts/datalayer-observer/templates/logs-collector.yaml b/charts/datalayer-observer/templates/logs-collector.yaml
index 2b1c96d..c95ebc8 100644
--- a/charts/datalayer-observer/templates/logs-collector.yaml
+++ b/charts/datalayer-observer/templates/logs-collector.yaml
@@ -35,7 +35,7 @@ spec:
           - type: router
             routes:
               - output: combine_python_otel_logs
-                expr: 'resource["k8s.container.name"] in ["iam", "jupyter", "operator", "operator-companion"]'
+                expr: 'resource["k8s.container.name"] in ["iam", "jupyter", "operator", "jupyter-companion"]'
             default: combine_logs
           - id: combine_python_otel_logs
             type: recombine
diff --git a/charts/datalayer-operator/templates/companion-role.yaml b/charts/datalayer-operator/templates/companion-role.yaml
index 2127dea..4658359 100644
--- a/charts/datalayer-operator/templates/companion-role.yaml
+++ b/charts/datalayer-operator/templates/companion-role.yaml
@@ -2,9 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   namespace: datalayer-jupyter
-  name: datalayer-operator-companion
+  name: datalayer-jupyter-companion
   labels:
-    k8s-app: datalayer-operator-companion
+    k8s-app: datalayer-jupyter-companion
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
diff --git a/charts/datalayer-operator/templates/companion-rolebinding.yaml b/charts/datalayer-operator/templates/companion-rolebinding.yaml
index d36adc7..28b26a7 100644
--- a/charts/datalayer-operator/templates/companion-rolebinding.yaml
+++ b/charts/datalayer-operator/templates/companion-rolebinding.yaml
@@ -5,9 +5,9 @@ metadata:
   namespace: datalayer-jupyter
 subjects:
 - kind: ServiceAccount
-  name: datalayer-operator-companion
+  name: datalayer-jupyter-companion
   namespace: datalayer-jupyter
 roleRef:
   kind: Role
-  name: datalayer-operator-companion
+  name: datalayer-jupyter-companion
   apiGroup: rbac.authorization.k8s.io
diff --git a/charts/datalayer-operator/templates/companion-serviceaccount.yaml b/charts/datalayer-operator/templates/companion-serviceaccount.yaml
index bb580f7..b1224e9 100644
--- a/charts/datalayer-operator/templates/companion-serviceaccount.yaml
+++ b/charts/datalayer-operator/templates/companion-serviceaccount.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: datalayer-operator-companion
+  name: datalayer-jupyter-companion
   namespace: datalayer-jupyter
 # Opt out of auto API credentials to prevent all containers
 # to use the service account