diff --git a/helm/templates/service-monitor.yaml b/helm/templates/service-monitor.yaml
index 49497ad98..0750ab4ec 100644
--- a/helm/templates/service-monitor.yaml
+++ b/helm/templates/service-monitor.yaml
@@ -4,7 +4,10 @@ kind: ServiceMonitor
 metadata:
   name: {{ include "parseable.fullname" . }}
   namespace: {{ default .Release.Namespace .Values.parseable.metrics.serviceMonitor.namespace | quote }}
-  labels: 
+  labels:
+    {{- with .Values.parseable.metrics.serviceMonitor.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
     {{- include "parseable.labels" . | nindent 4 }}
 spec:
   {{ if .Values.parseable.metrics.serviceMonitor.spec.jobLabel }}
diff --git a/helm/values.yaml b/helm/values.yaml
index a7ba8d7ad..949ae2365 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -3,7 +3,7 @@ parseable:
     repository: containers.parseable.com/parseable/parseable
     tag: v1.6.3
     pullPolicy: Always
-  ## object store can be local, s3 or blob.
+  ## object store can be local-store, s3-store or blob-store.
   ## local needs to be false if set to object store.
   store: local-store
   ## Set to true if you want to deploy Parseable in a HA mode (multiple ingestors)
@@ -192,6 +192,7 @@ parseable:
   metrics:
     serviceMonitor:
       enabled: false
+      labels: {}
       namespace: ""
       spec:
         jobLabel: ""
@@ -300,7 +301,7 @@ fluent-bit:
   replicaCount: 1
   image:
     repository: parseable/fluent-bit
-    tag: "v1"
+    tag: "v2"
     pullPolicy: Always
   testFramework:
     enabled: true
@@ -382,25 +383,21 @@ fluent-bit:
       [OUTPUT]
           Name parseable
           Match kube.*
-          P_Server parseable.parseable.svc.cluster.local
-          P_Port 80
-          P_Username admin
-          P_Password admin
-          P_Stream $NAMESPACE 
+          Server_Host parseable.parseable.svc.cluster.local
+          Username admin
+          Password admin
+          Server_Port 80
+          Stream $NAMESPACE
+          Exclude_Namespaces kube-system, default
 
       [OUTPUT]
-          Name http
+          Name parseable
           Match k8s_events
-          host parseable.parseable.svc.cluster.local
-          http_User admin
-          http_Passwd admin
-          format json
-          port 80
-          header Content-Type application/json
-          header X-P-Stream k8s-events
-          uri /api/v1/ingest
-          json_date_key timestamp
-          json_date_format iso8601
+          Server_Host parseable.parseable.svc.cluster.local
+          Server_Port 80
+          Username admin
+          Password admin
+          Stream k8s-events 
 
     upstream: {}