diff --git a/fluent-bit/Chart.yaml b/fluent-bit/Chart.yaml
index 93d3528..d2aed79 100644
--- a/fluent-bit/Chart.yaml
+++ b/fluent-bit/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.3
+version: 0.1.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/fluent-bit/templates/clusterrole.yaml b/fluent-bit/templates/clusterrole.yaml
index b60a3e8..d7b0ddd 100644
--- a/fluent-bit/templates/clusterrole.yaml
+++ b/fluent-bit/templates/clusterrole.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: fluent-bit-role
+  name: {{ include "fluent-bit.fullname" . }}-role
 rules:
   - nonResourceURLs:
       - /metrics
diff --git a/fluent-bit/templates/clusterrolebinding.yaml b/fluent-bit/templates/clusterrolebinding.yaml
index 4f78ca5..46e6723 100644
--- a/fluent-bit/templates/clusterrolebinding.yaml
+++ b/fluent-bit/templates/clusterrolebinding.yaml
@@ -1,11 +1,11 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: fluent-bit-role-binding
+  name: {{ include "fluent-bit.fullname" . }}-role-binding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: fluent-bit-role
+  name: {{ include "fluent-bit.fullname" . }}-role
 subjects:
   - kind: ServiceAccount
     name: fluent-bit
diff --git a/fluent-bit/templates/configmap-config.yaml b/fluent-bit/templates/configmap-config.yaml
index e51640e..ffb7176 100644
--- a/fluent-bit/templates/configmap-config.yaml
+++ b/fluent-bit/templates/configmap-config.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: fluent-bit-config
+  name: {{ include "generated-service.fullname" . }}-config
   namespace: observability
 data:
   fluent-bit.conf: |
diff --git a/fluent-bit/templates/configmap-info.yaml b/fluent-bit/templates/configmap-info.yaml
index 77a289d..802d01c 100644
--- a/fluent-bit/templates/configmap-info.yaml
+++ b/fluent-bit/templates/configmap-info.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: fluent-bit-cluster-info
+  name: {{ include "fluent-bit.fullname" . }}-cluster-info
   namespace: observability
 data:
   cluster.name: "{{ .Values.configmap.info.clusterName }}"
diff --git a/fluent-bit/templates/daemonset.yaml b/fluent-bit/templates/daemonset.yaml
index c3b49cf..d2557cf 100644
--- a/fluent-bit/templates/daemonset.yaml
+++ b/fluent-bit/templates/daemonset.yaml
@@ -21,39 +21,39 @@ spec:
         {{- include "fluent-bit.selectorLabels" . | nindent 8 }}
     spec:
       containers:
-      - name: fluent-bit
+      - name: {{ include "fluent-bit.fullname" . }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
             - name: AWS_REGION
               valueFrom:
                 configMapKeyRef:
-                  name: fluent-bit-cluster-info
+                  name: {{ include "fluent-bit.fullname" . }}-cluster-info
                   key: logs.region
             - name: CLUSTER_NAME
               valueFrom:
                 configMapKeyRef:
-                  name: fluent-bit-cluster-info
+                  name: {{ include "fluent-bit.fullname" . }}-cluster-info
                   key: cluster.name
             - name: HTTP_SERVER
               valueFrom:
                 configMapKeyRef:
-                  name: fluent-bit-cluster-info
+                  name: {{ include "fluent-bit.fullname" . }}-cluster-info
                   key: http.server
             - name: HTTP_PORT
               valueFrom:
                 configMapKeyRef:
-                  name: fluent-bit-cluster-info
+                  name: {{ include "fluent-bit.fullname" . }}-cluster-info
                   key: http.port
             - name: READ_FROM_HEAD
               valueFrom:
                 configMapKeyRef:
-                  name: fluent-bit-cluster-info
+                  name: {{ include "fluent-bit.fullname" . }}-cluster-info
                   key: read.head
             - name: READ_FROM_TAIL
               valueFrom:
                 configMapKeyRef:
-                  name: fluent-bit-cluster-info
+                  name: {{ include "fluent-bit.fullname" . }}-cluster-info
                   key: read.tail
             - name: HOST_NAME
               valueFrom:
@@ -81,7 +81,7 @@ spec:
         - name: varlibdockercontainers
           mountPath: /var/lib/docker/containers
           readOnly: true
-        - name: fluent-bit-config
+        - name: {{ include "fluent-bit.fullname" . }}-config
           mountPath: /fluent-bit/etc/
         - name: runlogjournal
           mountPath: /run/log/journal
@@ -102,9 +102,9 @@ spec:
       - name: varlibdockercontainers
         hostPath:
           path: /var/lib/docker/containers
-      - name: fluent-bit-config
+      - name: {{ include "fluent-bit.fullname" . }}-config
         configMap:
-          name: fluent-bit-config
+          name: {{ include "fluent-bit.fullname" . }}-config
       - name: runlogjournal
         hostPath:
           path: /run/log/journal