diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/fluentbit.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/fluentbit.yaml
index 95ffb4c4..d7bab2eb 100644
--- a/freeleaps/helm-pkg/authentication/templates/authentication/fluentbit.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/fluentbit.yaml
@@ -23,26 +23,22 @@ spec:
 {{- end }}
 ---
 apiVersion: fluentbit.fluent.io/v1alpha2
-kind: Parser
+kind: ClusterParser
 metadata:
   name: {{ .Release.Name }}-log-parser
-  namespace: freeleaps-logging-system
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}-log-parser
-    fluentbit.fluent.io/enabled: "true"
 spec:
   json:
     timeKey: {{ .Values.fluentbit.timeKey | quote }}
     timeFormat: {{ .Values.fluentbit.timeFormat | quote }}
 ---
 apiVersion: fluentbit.fluent.io/v1alpha2
-kind: Output
+kind: ClusterOutput
 metadata:
   name: {{ .Release.Name }}-log-output
-  namespace: freeleaps-logging-system
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}-log-output
-    fluentbit.fluent.io/enabled: "true"
 spec:
   match: "*"
   forward:
@@ -53,8 +49,6 @@ apiVersion: fluentbit.fluent.io/v1alpha2
 kind: ClusterInput
 metadata:
   name: {{ .Release.Name }}-log-input
-  labels:
-    fluentbit.fluent.io/enabled: "true"
 spec:
   tail:
     path: {{ .Values.fluentbit.logPath | quote }}
@@ -64,9 +58,6 @@ apiVersion: fluentbit.fluent.io/v1alpha2
 kind: ClusterFluentBitConfig
 metadata:
   name: {{ .Release.Name }}-log-collector-config
-  namespace: freeleaps-logging-system
-  labels:
-    fluentbit.fluent.io/enabled: "true"
 spec:
   inputSelector:
     matchLabels: