diff --git a/deploy/helm/elastic-agent/examples/README.md b/deploy/helm/elastic-agent/examples/README.md
index 7c0963b94f7..7f5e5f7d17e 100644
--- a/deploy/helm/elastic-agent/examples/README.md
+++ b/deploy/helm/elastic-agent/examples/README.md
@@ -6,13 +6,18 @@ Here is a collection of example configurations for the eck-integrations chart.
 - [System - custom authlogs path](kubernetes-default/README.md)
 - [Kubernetes - only container logs](kubernetes-only-logs/README.md)
 - [Kubernetes - only hints autodiscover](kubernetes-hints-autodiscover/README.md)
-- [Custom Integration - nginx](nginx-custom-integration/README.md)
+- [Nginx - custom integration](nginx-custom-integration/README.md)
 - [Multiple Integrations](multiple-integrations/README.md)
 - [ECK - Kubernetes - defaults](eck/README.md)
+- [Fleet - Managed Agent](fleet-managed/README.md)
+- [User created cluster role](user-cluster-role/README.md)
+- [User created service account](user-service-account/README.md)
 
 Useful links:
 
 - [Kibana - Install and uninstall Elastic Agent integration assets](https://www.elastic.co/guide/en/fleet/current/install-uninstall-integration-assets.html)
 - [Kibana - Creating API Keys](https://www.elastic.co/guide/en/kibana/current/api-keys.html)
 - [Kibana - Create roles and users](https://www.elastic.co/guide/en/kibana/current/using-kibana-with-security.html#security-create-roles)
-- [ECK operator](https://github.com/elastic/cloud-on-k8s).
+- [ECK operator](https://github.com/elastic/cloud-on-k8s)
+- [Fleet - Manage Agents](https://www.elastic.co/guide/en/fleet/current/manage-agents-in-fleet.html)
+- [Fleet - Installing Elastic Agent](https://www.elastic.co/guide/en/fleet/current/install-fleet-managed-elastic-agent.html#elastic-agent-installation-steps)
diff --git a/deploy/helm/elastic-agent/examples/kubernetes-default/README.md b/deploy/helm/elastic-agent/examples/kubernetes-default/README.md
index d0263291b54..1ffd8ac0ef5 100644
--- a/deploy/helm/elastic-agent/examples/kubernetes-default/README.md
+++ b/deploy/helm/elastic-agent/examples/kubernetes-default/README.md
@@ -36,6 +36,7 @@ helm install elastic-agent ../../ \
      --set 'agent.imagePullSecrets[0].name=regcred' \
      --set outputs.default.type=ESSecretAuthAPI \
      --set outputs.default.secretName=es-api-secret
+```
 
 ## Validate:
 
diff --git a/deploy/helm/elastic-agent/templates/agent/eck/deployment.yaml b/deploy/helm/elastic-agent/templates/agent/eck/deployment.yaml
index 5ab95d88367..d1237d84043 100644
--- a/deploy/helm/elastic-agent/templates/agent/eck/deployment.yaml
+++ b/deploy/helm/elastic-agent/templates/agent/eck/deployment.yaml
@@ -34,8 +34,8 @@ spec:
   {{- end -}}
   {{- end }}
   deployment:
-    {{- with ($presetVal).replicaCount }}
-    replicas: {{ . }}
+    {{- if hasKey $presetVal "replicaCount" }}
+    replicas: {{ ($presetVal).replicaCount }}
     {{- end }}
     podTemplate:
 {{- toYaml ($podTemplateResource).template | nindent 6 }}
diff --git a/deploy/helm/elastic-agent/templates/agent/eck/statefulset.yaml b/deploy/helm/elastic-agent/templates/agent/eck/statefulset.yaml
index 02ea89d169a..3a32fae7be8 100644
--- a/deploy/helm/elastic-agent/templates/agent/eck/statefulset.yaml
+++ b/deploy/helm/elastic-agent/templates/agent/eck/statefulset.yaml
@@ -34,8 +34,8 @@ spec:
   {{- end -}}
   {{- end }}
   statefulSet:
-    {{- with ($presetVal).replicaCount }}
-    replicas: {{ . }}
+    {{- if hasKey $presetVal "replicaCount" }}
+    replicas: {{ ($presetVal).replicaCount }}
     {{- end }}
     podTemplate:
 {{- toYaml ($podTemplateResource).template | nindent 6 }}
diff --git a/deploy/helm/elastic-agent/templates/agent/k8s/deployment.yaml b/deploy/helm/elastic-agent/templates/agent/k8s/deployment.yaml
index 8cfc3f7e144..fccf2f8061b 100644
--- a/deploy/helm/elastic-agent/templates/agent/k8s/deployment.yaml
+++ b/deploy/helm/elastic-agent/templates/agent/k8s/deployment.yaml
@@ -17,6 +17,9 @@ spec:
   selector:
     matchLabels:
       name: {{ $agentName }}
+  {{- if hasKey $presetVal "replicaCount" }}
+  replicas: {{ ($presetVal).replicaCount }}
+  {{- end }}
   template:
     metadata:
       labels:
diff --git a/deploy/helm/elastic-agent/templates/agent/k8s/statefulset.yaml b/deploy/helm/elastic-agent/templates/agent/k8s/statefulset.yaml
index 3a661df490d..f389306da21 100644
--- a/deploy/helm/elastic-agent/templates/agent/k8s/statefulset.yaml
+++ b/deploy/helm/elastic-agent/templates/agent/k8s/statefulset.yaml
@@ -17,6 +17,9 @@ spec:
   selector:
     matchLabels:
       name: {{ $agentName }}
+  {{- if hasKey $presetVal "replicaCount" }}
+  replicas: {{ ($presetVal).replicaCount }}
+  {{- end }}
   template:
     metadata:
       labels: