diff --git a/network-mapper/templates/agent-daemonset.yaml b/network-mapper/templates/agent-daemonset.yaml
index 592526db..9a37014f 100644
--- a/network-mapper/templates/agent-daemonset.yaml
+++ b/network-mapper/templates/agent-daemonset.yaml
@@ -1,4 +1,3 @@
-{{ if or .Values.sniffer.enable .Values.bpfman.enable }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -62,13 +61,13 @@ spec:
         - name: component-config
           configMap:
             name: {{ template "otterize.mapper.componentConfigmap" . }}
-        - name: ebpfman-socket
-          emptyDir: { }
-        - name: ebpf-programs
-          emptyDir: { }
-        - name: cri
+        - name: containerd
           hostPath:
-            path: "/run/containerd"
+            path: "/run/k3s/containerd/containerd.sock"
+            type: Socket
+        - name: bpffs
+          hostPath:
+            path: "/sys/fs/bpf"
 
       containers:
         - name: node-agent
@@ -89,10 +88,13 @@ spec:
             - mountPath: /host/proc
               name: proc
               readOnly: true
-            - mountPath: /run/bpfman-sock/
-              name: ebpfman-socket
-            - mountPath: /var/run/containerd
-              name: cri
+            - mountPath: /var/run/containerd/containerd.sock
+              name: containerd
+            - mountPath: /host/sys/fs/bpf
+              name: bpffs
+              readOnly: false
+          securityContext:
+            privileged: true
 
 
         {{ if .Values.sniffer.enable }}
@@ -180,26 +182,3 @@ spec:
               name: component-config
               readOnly: true
         {{ end }}
-
-        {{ if .Values.bpfman.enable }}
-        - name: ebpf-agent
-          image: "{{ .Values.bpfman.repository }}/{{ .Values.bpfman.image }}:{{ .Values.bpfman.tag }}"
-
-          {{ if .Values.bpfman.pullPolicy }}
-          imagePullPolicy: {{ .Values.bpfman.pullPolicy }}
-          {{ end }}
-
-          securityContext:
-            privileged: true
-          volumeMounts:
-            - mountPath: /host/proc
-              name: proc
-              readOnly: true
-            - mountPath: /run/bpfman-sock/
-              name: ebpfman-socket
-          env:
-            - name: RUST_LOG
-              value: "{{ .Values.bpfman.logLevel }}"
-        {{ end }}
-
-{{ end }}
\ No newline at end of file
diff --git a/network-mapper/values.yaml b/network-mapper/values.yaml
index 5205477d..dc912a62 100644
--- a/network-mapper/values.yaml
+++ b/network-mapper/values.yaml
@@ -143,14 +143,6 @@ visibilitydns:
   pullSecrets:
   resources: { } # see comment under mapper.resources
 
-bpfman:
-  enable: true
-  repository: otterize
-  image: bpfman
-  tag: latest
-  pullPolicy:
-  logLevel: info
-
 aws:
   visibility:
     enabled: false