diff --git a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
index 16385331e34..e279deb2af1 100644
--- a/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/kubernetes-default/rendered/manifest.yaml
@@ -62,19 +62,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        node: ${NODE_NAME}
-        scope: cluster
-      kubernetes_leaderelection:
-        enabled: true
     inputs:
       - data_stream:
           namespace: default
@@ -94,6 +81,19 @@ stringData:
           - /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        node: ${NODE_NAME}
+        scope: cluster
+      kubernetes_leaderelection:
+        enabled: true
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -119,18 +119,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        enabled: false
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -388,6 +376,18 @@ stringData:
           period: 10s
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        enabled: false
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -413,19 +413,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        node: ${NODE_NAME}
-        scope: node
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -571,6 +558,19 @@ stringData:
           ssl.verification_mode: none
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        node: ${NODE_NAME}
+        scope: node
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/cluster-role.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1089,7 +1089,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: 53aa4ccc3e8557125fecf738e70722e2aaa1199ee79a823f684a9d4a296af7b0
+        checksum/config: 8a63bcd6f0075a7f9a76df873aeb32c21a97343f33f83f176d33e9a813d2b61b
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1209,7 +1209,7 @@ spec:
       labels:
         name: agent-clusterwide-example
       annotations:
-        checksum/config: 73527b0aad319ef33239ef3c862820c5ee5cafb42e2ce164049646791b69ec68
+        checksum/config: 18d32ecd855b070361e0fb669b432c5064ef150156713b4f62f813cc7ea71ad2
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1290,7 +1290,7 @@ spec:
       labels:
         name: agent-ksmsharded-example
       annotations:
-        checksum/config: 4ec2b2ef4d3c5c103e79e47a45d4b3b4f9f774e85293f9a5b2d56556025f1d2d
+        checksum/config: fd239221a3952ee71cb20cc03c270a1061689e8daaef40ed2f21279e107c2323
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
diff --git a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
index 8f7d94ec561..69f7cea7cd0 100644
--- a/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/kubernetes-hints-autodiscover/rendered/manifest.yaml
@@ -62,19 +62,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        node: ${NODE_NAME}
-        scope: cluster
-      kubernetes_leaderelection:
-        enabled: true
     inputs:
       - data_stream:
           namespace: default
@@ -94,6 +81,19 @@ stringData:
           - /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        node: ${NODE_NAME}
+        scope: cluster
+      kubernetes_leaderelection:
+        enabled: true
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -119,18 +119,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        enabled: false
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -388,6 +376,18 @@ stringData:
           period: 10s
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        enabled: false
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -413,21 +413,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        hints:
-          enabled: true
-        node: ${NODE_NAME}
-        scope: node
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -573,6 +558,21 @@ stringData:
           ssl.verification_mode: none
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        hints:
+          enabled: true
+        node: ${NODE_NAME}
+        scope: node
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/cluster-role.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1091,7 +1091,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: 21fb7e317577410096de8d8e0fb03b32ad2e406b549f75085ae6907d38678e46
+        checksum/config: 72f0ef2c907f2d0deea78734463e196b1b8407f920b633979e6bb239ff857267
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1122,10 +1122,10 @@ spec:
           name: external-inputs
         - name: agent-data
           hostPath:
-            
+
             path: /etc/elastic-agent/default/agent-pernode-example/state
             type: DirectoryOrCreate
-        
+
         - name: config
           secret:
             defaultMode: 0444
@@ -1236,7 +1236,7 @@ spec:
       labels:
         name: agent-clusterwide-example
       annotations:
-        checksum/config: 73527b0aad319ef33239ef3c862820c5ee5cafb42e2ce164049646791b69ec68
+        checksum/config: 18d32ecd855b070361e0fb669b432c5064ef150156713b4f62f813cc7ea71ad2
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1247,7 +1247,7 @@ spec:
       volumes:
         - emptyDir: {}
           name: agent-data
-        
+
         - name: config
           secret:
             defaultMode: 0444
@@ -1317,7 +1317,7 @@ spec:
       labels:
         name: agent-ksmsharded-example
       annotations:
-        checksum/config: 4ec2b2ef4d3c5c103e79e47a45d4b3b4f9f774e85293f9a5b2d56556025f1d2d
+        checksum/config: fd239221a3952ee71cb20cc03c270a1061689e8daaef40ed2f21279e107c2323
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1328,7 +1328,7 @@ spec:
       volumes:
         - emptyDir: {}
           name: agent-data
-        
+
         - name: config
           secret:
             defaultMode: 0444
diff --git a/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
index c3a3966facf..bdcd835e294 100644
--- a/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/kubernetes-only-logs/rendered/manifest.yaml
@@ -36,19 +36,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        node: ${NODE_NAME}
-        scope: node
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -104,6 +91,19 @@ stringData:
           prospector.scanner.symlinks: true
         type: filestream
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        node: ${NODE_NAME}
+        scope: node
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/cluster-role.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -227,7 +227,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: 4de2216224a483ae1355aeec668894f764edc48bd3481d8fbc65f67eedc1b336
+        checksum/config: bb84f05ca178fdc34ba9293f7ab3f3ad55c70f8b63522f488b13aad6e8ef8bae
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -256,10 +256,10 @@ spec:
           name: var-lib
         - name: agent-data
           hostPath:
-            
+
             path: /etc/elastic-agent/default/agent-pernode-example/state
             type: DirectoryOrCreate
-        
+
         - name: config
           secret:
             defaultMode: 0444
diff --git a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
index 5f16fc5d56d..c26cae1924a 100644
--- a/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/multiple-integrations/rendered/manifest.yaml
@@ -62,19 +62,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        node: ${NODE_NAME}
-        scope: cluster
-      kubernetes_leaderelection:
-        enabled: true
     inputs:
       - data_stream:
           namespace: default
@@ -120,6 +107,19 @@ stringData:
           - nginx-stubstatus
         type: nginx/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        node: ${NODE_NAME}
+        scope: cluster
+      kubernetes_leaderelection:
+        enabled: true
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -145,18 +145,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        enabled: false
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -414,6 +402,18 @@ stringData:
           period: 10s
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        enabled: false
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/k8s/secret.yaml
 apiVersion: v1
@@ -439,21 +439,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        hints:
-          enabled: true
-        node: ${NODE_NAME}
-        scope: node
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -599,6 +584,21 @@ stringData:
           ssl.verification_mode: none
         type: kubernetes/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        hints:
+          enabled: true
+        node: ${NODE_NAME}
+        scope: node
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/cluster-role.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1117,7 +1117,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: 21fb7e317577410096de8d8e0fb03b32ad2e406b549f75085ae6907d38678e46
+        checksum/config: 72f0ef2c907f2d0deea78734463e196b1b8407f920b633979e6bb239ff857267
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1148,10 +1148,10 @@ spec:
           name: external-inputs
         - name: agent-data
           hostPath:
-            
+
             path: /etc/elastic-agent/default/agent-pernode-example/state
             type: DirectoryOrCreate
-        
+
         - name: config
           secret:
             defaultMode: 0444
@@ -1252,7 +1252,7 @@ spec:
       labels:
         name: agent-clusterwide-example
       annotations:
-        checksum/config: b04d7965af8739293cd90e352c59d1240473f56febd9aded16ba766d77f90b5f
+        checksum/config: 23c0b4bc4b8fc0479c3cb3a102e0961cb3ca959603ba403ceecc61d6becae2e8
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1263,7 +1263,7 @@ spec:
       volumes:
         - emptyDir: {}
           name: agent-data
-        
+
         - name: config
           secret:
             defaultMode: 0444
@@ -1323,7 +1323,7 @@ spec:
       labels:
         name: agent-ksmsharded-example
       annotations:
-        checksum/config: 4ec2b2ef4d3c5c103e79e47a45d4b3b4f9f774e85293f9a5b2d56556025f1d2d
+        checksum/config: fd239221a3952ee71cb20cc03c270a1061689e8daaef40ed2f21279e107c2323
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -1334,7 +1334,7 @@ spec:
       volumes:
         - emptyDir: {}
           name: agent-data
-        
+
         - name: config
           secret:
             defaultMode: 0444
diff --git a/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
index efa5422e1ca..f727c56c180 100644
--- a/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/nginx-custom-integration/rendered/manifest.yaml
@@ -36,9 +36,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    providers:
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -66,6 +63,9 @@ stringData:
           - nginx-stubstatus
         type: nginx/metrics
         use_output: default
+    providers:
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/cluster-role.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -215,7 +215,7 @@ spec:
       labels:
         name: agent-nginx-example
       annotations:
-        checksum/config: 4b3a03273d11151ee0f8bbdc8e235f8b6d2b344e09dedc632ae6f7f9e8e0ef34
+        checksum/config: 627f26ad8791a17274403b380c484441f4b4667f49d72057b17921707be49b0c
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -224,10 +224,10 @@ spec:
       volumes:
         - name: agent-data
           hostPath:
-            
+
             path: /etc/elastic-agent/default/agent-nginx-example/state
             type: DirectoryOrCreate
-        
+
         - name: config
           secret:
             defaultMode: 0444
diff --git a/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml b/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
index 12e861df54d..58585512bed 100644
--- a/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
+++ b/deploy/helm/elastic-agent/examples/system-custom-auth-paths/rendered/manifest.yaml
@@ -36,19 +36,6 @@ stringData:
         type: elasticsearch
         username: elastic
     secret_references: []
-    agent:
-      monitoring:
-        enabled: true
-        logs: true
-        metrics: true
-        namespace: default
-        use_output: default
-    providers:
-      kubernetes:
-        node: ${NODE_NAME}
-        scope: node
-      kubernetes_leaderelection:
-        enabled: false
     inputs:
       - data_stream:
           namespace: default
@@ -176,6 +163,19 @@ stringData:
           period: 10s
         type: system/metrics
         use_output: default
+    agent:
+      monitoring:
+        enabled: true
+        logs: true
+        metrics: true
+        namespace: default
+        use_output: default
+    providers:
+      kubernetes:
+        node: ${NODE_NAME}
+        scope: node
+      kubernetes_leaderelection:
+        enabled: false
 ---
 # Source: elastic-agent/templates/agent/cluster-role.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -299,7 +299,7 @@ spec:
       labels:
         name: agent-pernode-example
       annotations:
-        checksum/config: 39e00ed2a77861d6ce0f1436c373284c3651db4325dbe5d25300677203cfdca7
+        checksum/config: 98894df21ad9e55e8b67f560960dd4136ba23936bd6c02c2a7a534fb7922de49
 
     spec:
       dnsPolicy: ClusterFirstWithHostNet
@@ -328,10 +328,10 @@ spec:
           name: var-lib
         - name: agent-data
           hostPath:
-            
+
             path: /etc/elastic-agent/default/agent-pernode-example/state
             type: DirectoryOrCreate
-        
+
         - name: config
           secret:
             defaultMode: 0444
diff --git a/deploy/helm/elastic-agent/templates/agent/k8s/_pod_template.tpl b/deploy/helm/elastic-agent/templates/agent/k8s/_pod_template.tpl
index 1c8688736b2..4d40e006515 100644
--- a/deploy/helm/elastic-agent/templates/agent/k8s/_pod_template.tpl
+++ b/deploy/helm/elastic-agent/templates/agent/k8s/_pod_template.tpl
@@ -52,13 +52,11 @@
             {{- end }}
             type: DirectoryOrCreate
         {{- end }}
-        {{- if eq $.Values.agent.fleet.enabled false }}
         {{/* standalone mode so config is static */}}
         - name: config
           secret:
             defaultMode: 0444
             secretName: {{ $agentName }}
-        {{- end }}
       {{- with ($presetVal).initContainers }}
       initContainers:
         {{- . | toYaml | nindent 8 }}
@@ -80,9 +78,7 @@
           {{- else }}
           image: "{{ $.Values.agent.image.repository }}:{{ $.Values.agent.version }}"
           {{- end }}
-          {{- if eq $.Values.agent.fleet.enabled false }}
           args: ["-c", "/etc/elastic-agent/agent.yml", "-e"]
-          {{- end }}
           {{- with ($presetVal).securityContext }}
           securityContext:
             {{- . | toYaml | nindent 12 }}
@@ -107,12 +103,10 @@
             - name: agent-data
               mountPath: /usr/share/elastic-agent/state
             {{- end }}
-            {{- if eq $.Values.agent.fleet.enabled false }}
             - name: config
               mountPath: /etc/elastic-agent/agent.yml
               readOnly: true
               subPath: agent.yml
-            {{- end }}
           env:
             - name: NODE_NAME
               valueFrom:
diff --git a/deploy/helm/elastic-agent/templates/agent/k8s/_secret.tpl b/deploy/helm/elastic-agent/templates/agent/k8s/_secret.tpl
index 88e880ee5fb..6625aa8dae4 100644
--- a/deploy/helm/elastic-agent/templates/agent/k8s/_secret.tpl
+++ b/deploy/helm/elastic-agent/templates/agent/k8s/_secret.tpl
@@ -3,6 +3,7 @@
 {{- $presetVal := index . 1 -}}
 {{- $agentName := index . 2 }}
   agent.yml: |-
+    {{- if eq $.Values.agent.fleet.enabled false }}
     id: {{ $agentName }}
     {{- with ($presetVal).outputs }}
     outputs:
@@ -11,6 +12,14 @@
       {{- end }}
     {{- end }}
     secret_references: []
+    inputs:
+      {{- with ($presetVal)._inputs -}}
+      {{- . | toYaml | nindent 6 }}
+      {{- end }}
+    {{- else }}
+    fleet:
+      enabled: true
+    {{- end }}
     {{- with ($presetVal).agent }}
     agent:
       {{- . | toYaml | nindent 6}}
@@ -19,8 +28,4 @@
     providers:
       {{- . | toYaml | nindent 6 }}
     {{- end }}
-    inputs:
-      {{- with ($presetVal)._inputs -}}
-      {{- . | toYaml | nindent 6 }}
-      {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/deploy/helm/elastic-agent/templates/agent/k8s/secret.yaml b/deploy/helm/elastic-agent/templates/agent/k8s/secret.yaml
index d4f045278d8..d207a5099d1 100644
--- a/deploy/helm/elastic-agent/templates/agent/k8s/secret.yaml
+++ b/deploy/helm/elastic-agent/templates/agent/k8s/secret.yaml
@@ -1,5 +1,4 @@
 {{- include "elasticagent.init" $ -}}
-{{- if eq $.Values.agent.fleet.enabled false }}
 {{- range $presetName, $presetVal := $.Values.agent.presets }}
 {{- if (eq $.Values.agent.engine "k8s") -}}
 {{- $agentName := include "elasticagent.preset.fullname" (list $ $presetName)  -}}
@@ -20,6 +19,5 @@ metadata:
 stringData:
 {{ include "elasticagent.engine.k8s.secretData" (list $ $presetVal $agentName) }}
 ---
-{{- end -}}
 {{- end }}
 {{- end }}