diff --git a/deploy/kubernetes/Makefile b/deploy/kubernetes/Makefile
index da1c7f92237..364b412b171 100644
--- a/deploy/kubernetes/Makefile
+++ b/deploy/kubernetes/Makefile
@@ -1,4 +1,4 @@
-ALL=filebeat metricbeat auditbeat heartbeat elastic-agent-standalone elastic-agent
+ALL=filebeat metricbeat auditbeat heartbeat elastic-agent-standalone
 BEAT_VERSION=$(shell head -n 1 ../../libbeat/docs/version.asciidoc | cut -c 17- )
 
 .PHONY: all $(ALL)
diff --git a/deploy/kubernetes/elastic-agent-kubernetes.yaml b/deploy/kubernetes/elastic-agent-kubernetes.yaml
deleted file mode 100644
index dae375c8e7f..00000000000
--- a/deploy/kubernetes/elastic-agent-kubernetes.yaml
+++ /dev/null
@@ -1,146 +0,0 @@
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: agent-ingest-management-nodescope
-  namespace: kube-system
-  labels:
-    app: agent-ingest-management-nodescope
-    group: ingest-management
-spec:
-  selector:
-    matchLabels:
-      app: agent-ingest-management-nodescope
-  template:
-    metadata:
-      labels:
-        app: agent-ingest-management-nodescope
-        group: ingest-management
-    spec:
-      serviceAccountName: agent-ingest-management
-      hostNetwork: true
-      dnsPolicy: ClusterFirstWithHostNet
-      containers:
-        - name: agent-ingest-management-nodescope
-          image: docker.elastic.co/beats/elastic-agent:8.0.0-SNAPSHOT
-          env:
-            - name: FLEET_ENROLL
-              value: "1"
-            # Use enrollment key of node scope configuration to distinguish node scope datasets
-            - name: FLEET_ENROLLMENT_TOKEN
-              value:
-            - name: KIBANA_HOST
-              value: "http://kibana:5601"
-            - name: NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-          securityContext:
-            runAsUser: 0
-          resources:
-            limits:
-              memory: 200Mi
-            requests:
-              cpu: 100m
-              memory: 100Mi
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: agent-ingest-management-clusterscope
-  namespace: kube-system
-  labels:
-    app: agent-ingest-management-clusterscope
-    group: ingest-management
-spec:
-  selector:
-    matchLabels:
-      app: agent-ingest-management-clusterscope
-  template:
-    metadata:
-      labels:
-        app: agent-ingest-management-clusterscope
-        group: ingest-management
-    spec:
-      serviceAccountName: agent-ingest-management
-      containers:
-        - name: agent-ingest-management-clusterscope
-          image: docker.elastic.co/beats/elastic-agent:8.0.0-SNAPSHOT
-          env:
-            - name: FLEET_ENROLL
-              value: "1"
-            # Use enrollment key of cluster scope configuration to distinguish node scope datasets
-            - name: FLEET_ENROLLMENT_TOKEN
-              value:
-            - name: KIBANA_HOST
-              value: "http://kibana:5601"
-            - name: NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-          securityContext:
-            runAsUser: 0
-          resources:
-            limits:
-              memory: 200Mi
-            requests:
-              cpu: 100m
-              memory: 100Mi
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: agent-ingest-management
-subjects:
-  - kind: ServiceAccount
-    name: agent-ingest-management
-    namespace: kube-system
-roleRef:
-  kind: ClusterRole
-  name: agent-ingest-management
-  apiGroup: rbac.authorization.k8s.io
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: agent-ingest-management
-  labels:
-    k8s-app: agent-ingest-management
-rules:
-  - apiGroups: [""]
-    resources:
-      - nodes
-      - namespaces
-      - events
-      - pods
-      - secrets
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["extensions"]
-    resources:
-      - replicasets
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["apps"]
-    resources:
-      - statefulsets
-      - deployments
-      - replicasets
-    verbs: ["get", "list", "watch"]
-  - apiGroups:
-      - ""
-    resources:
-      - nodes/stats
-    verbs:
-      - get
-  # required for apiserver
-  - nonResourceURLs:
-      - "/metrics"
-    verbs:
-      - get
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: agent-ingest-management
-  namespace: kube-system
-  labels:
-    k8s-app: agent-ingest-management
----
diff --git a/deploy/kubernetes/elastic-agent/elastic-agent-daemonset.yaml b/deploy/kubernetes/elastic-agent/elastic-agent-daemonset.yaml
deleted file mode 100644
index 9dd5727d1f7..00000000000
--- a/deploy/kubernetes/elastic-agent/elastic-agent-daemonset.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: agent-ingest-management-nodescope
-  namespace: kube-system
-  labels:
-    app: agent-ingest-management-nodescope
-    group: ingest-management
-spec:
-  selector:
-    matchLabels:
-      app: agent-ingest-management-nodescope
-  template:
-    metadata:
-      labels:
-        app: agent-ingest-management-nodescope
-        group: ingest-management
-    spec:
-      serviceAccountName: agent-ingest-management
-      hostNetwork: true
-      dnsPolicy: ClusterFirstWithHostNet
-      containers:
-        - name: agent-ingest-management-nodescope
-          image: docker.elastic.co/beats/elastic-agent:8.0.0-SNAPSHOT
-          env:
-            - name: FLEET_ENROLL
-              value: "1"
-            # Use enrollment key of node scope configuration to distinguish node scope datasets
-            - name: FLEET_ENROLLMENT_TOKEN
-              value:
-            - name: KIBANA_HOST
-              value: "http://kibana:5601"
-            - name: NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-          securityContext:
-            runAsUser: 0
-          resources:
-            limits:
-              memory: 200Mi
-            requests:
-              cpu: 100m
-              memory: 100Mi
diff --git a/deploy/kubernetes/elastic-agent/elastic-agent-deployment.yaml b/deploy/kubernetes/elastic-agent/elastic-agent-deployment.yaml
deleted file mode 100644
index a1f026442db..00000000000
--- a/deploy/kubernetes/elastic-agent/elastic-agent-deployment.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: agent-ingest-management-clusterscope
-  namespace: kube-system
-  labels:
-    app: agent-ingest-management-clusterscope
-    group: ingest-management
-spec:
-  selector:
-    matchLabels:
-      app: agent-ingest-management-clusterscope
-  template:
-    metadata:
-      labels:
-        app: agent-ingest-management-clusterscope
-        group: ingest-management
-    spec:
-      serviceAccountName: agent-ingest-management
-      containers:
-        - name: agent-ingest-management-clusterscope
-          image: docker.elastic.co/beats/elastic-agent:8.0.0-SNAPSHOT
-          env:
-            - name: FLEET_ENROLL
-              value: "1"
-            # Use enrollment key of cluster scope configuration to distinguish node scope datasets
-            - name: FLEET_ENROLLMENT_TOKEN
-              value:
-            - name: KIBANA_HOST
-              value: "http://kibana:5601"
-            - name: NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-          securityContext:
-            runAsUser: 0
-          resources:
-            limits:
-              memory: 200Mi
-            requests:
-              cpu: 100m
-              memory: 100Mi
diff --git a/deploy/kubernetes/elastic-agent/elastic-agent-role-binding.yaml b/deploy/kubernetes/elastic-agent/elastic-agent-role-binding.yaml
deleted file mode 100644
index bc451c6adf3..00000000000
--- a/deploy/kubernetes/elastic-agent/elastic-agent-role-binding.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: agent-ingest-management
-subjects:
-  - kind: ServiceAccount
-    name: agent-ingest-management
-    namespace: kube-system
-roleRef:
-  kind: ClusterRole
-  name: agent-ingest-management
-  apiGroup: rbac.authorization.k8s.io
diff --git a/deploy/kubernetes/elastic-agent/elastic-agent-role.yaml b/deploy/kubernetes/elastic-agent/elastic-agent-role.yaml
deleted file mode 100644
index 66b1bdc0437..00000000000
--- a/deploy/kubernetes/elastic-agent/elastic-agent-role.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: agent-ingest-management
-  labels:
-    k8s-app: agent-ingest-management
-rules:
-  - apiGroups: [""]
-    resources:
-      - nodes
-      - namespaces
-      - events
-      - pods
-      - secrets
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["extensions"]
-    resources:
-      - replicasets
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["apps"]
-    resources:
-      - statefulsets
-      - deployments
-      - replicasets
-    verbs: ["get", "list", "watch"]
-  - apiGroups:
-      - ""
-    resources:
-      - nodes/stats
-    verbs:
-      - get
-  # required for apiserver
-  - nonResourceURLs:
-      - "/metrics"
-    verbs:
-      - get
diff --git a/deploy/kubernetes/elastic-agent/elastic-agent-service-account.yaml b/deploy/kubernetes/elastic-agent/elastic-agent-service-account.yaml
deleted file mode 100644
index 107e4210814..00000000000
--- a/deploy/kubernetes/elastic-agent/elastic-agent-service-account.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: agent-ingest-management
-  namespace: kube-system
-  labels:
-    k8s-app: agent-ingest-management