diff --git a/entity-types/ext-fluentbit/definition.yml b/entity-types/ext-fluentbit/definition.yml
deleted file mode 100644
index 34f1f1c4e..000000000
--- a/entity-types/ext-fluentbit/definition.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-domain: EXT
-type: FLUENTBIT
-synthesis:
-  rules:
-  - compositeIdentifier:
-        separator: "/"
-        attributes:
-          - namespace
-          - helm_release_name
-    name: helm_release_name
-    encodeIdentifierInGUID: true
-    conditions:
-    - attribute: eventType
-      value: Metric
-    - attribute: metricName
-      prefix: fluentbit_
-dashboardTemplates:
-  newRelic:
-    template: dashboard.json
\ No newline at end of file
diff --git a/entity-types/ext-fluentbit/dashboard.json b/entity-types/ext-fluentbit_kubernetes/dashboard.json
similarity index 99%
rename from entity-types/ext-fluentbit/dashboard.json
rename to entity-types/ext-fluentbit_kubernetes/dashboard.json
index fa9f45ba7..1c5a3f7d5 100644
--- a/entity-types/ext-fluentbit/dashboard.json
+++ b/entity-types/ext-fluentbit_kubernetes/dashboard.json
@@ -938,7 +938,7 @@
             "nrqlQueries": [
               {
                 "accountId": 0,
-                "query": "SELECT average(fluentbit_storage_fs_chunks_up) AS 'Up (in memory)', average(fluentbit_storage_fs_chunks_down) AS 'Down (fs only)'  FROM Metric since '2024-02-29 13:22:00+0000' UNTIL '2024-02-29 14:31:00+0000' timeseries MAX "
+                "query": "SELECT average(fluentbit_storage_fs_chunks_up) AS 'Up (in memory)', average(fluentbit_storage_fs_chunks_down) AS 'Down (fs only)'  FROM Metric timeseries MAX "
               }
             ],
             "platformOptions": {
diff --git a/entity-types/ext-fluentbit_kubernetes/definition.yml b/entity-types/ext-fluentbit_kubernetes/definition.yml
new file mode 100644
index 000000000..5ff82c402
--- /dev/null
+++ b/entity-types/ext-fluentbit_kubernetes/definition.yml
@@ -0,0 +1,31 @@
+domain: EXT
+type: FLUENTBIT_KUBERNETES
+synthesis:
+  rules:
+  - compositeIdentifier:
+        separator: ":"
+        attributes:
+          - cluster_name
+          - namespace
+          - daemonset_name
+    name: daemonset_name
+    encodeIdentifierInGUID: true
+    conditions:
+    - attribute: eventType
+      value: Metric
+    - attribute: metricName
+      prefix: fluentbit_
+    - attribute: source
+      value: kubernetes
+    tags:
+      daemonset_name:
+        entityTagNames: [k8s.daemonsetName]
+      namespace:
+        entityTagNames: [k8s.namespaceName]
+      cluster_name:
+        entityTagNames: [k8s.clusterName]
+      version:
+        entityTagNames: [fluentbit.version]
+dashboardTemplates:
+  newRelic:
+    template: dashboard.json
\ No newline at end of file