diff --git a/deployment.yaml b/deployment.yaml
index 5cc038b..5fbbb0b 100644
--- a/deployment.yaml
+++ b/deployment.yaml
@@ -1,38 +1,34 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: netdata-parent
+  name: netdata-k8s-state
   labels:
     app: netdata
-    role: parent
+    role: k8sState
 spec:
-  replicas: 1
   strategy:
     type: Recreate
   selector:
     matchLabels:
       app: netdata
-      role: parent
+      role: k8sState
   template:
     metadata:
+      annotations:
+        container.apparmor.security.beta.kubernetes.io/netdata: unconfined
       labels:
         app: netdata
-        role: parent
+        role: k8sState
     spec:
       securityContext:
         fsGroup: 201
       serviceAccountName: netdata
+      restartPolicy: Always
       containers:
         - name: netdata
           image: "netdata/netdata:edge"
           imagePullPolicy: Always
           env:
-            - name: NETDATA_CLAIM_URL
-              value: "https://api.netdata.cloud"
-            - name: NETDATA_CLAIM_TOKEN
-              value: "REDACTED"
-            - name: NETDATA_CLAIM_ROOMS
-              value: "REDACTED"
             - name: MY_POD_NAME
               valueFrom:
                 fieldRef:
@@ -63,39 +59,43 @@ spec:
             periodSeconds: 30
             successThreshold: 1
             timeoutSeconds: 1
-          securityContext:
-            runAsUser: 201
-            runAsGroup: 201
           volumeMounts:
             - name: os-release
               mountPath: /host/etc/os-release
             - name: configmap
-              mountPath: /etc/netdata/health_alarm_notify.conf
-              subPath: health
+              mountPath: /etc/netdata/go.d.conf
+              subPath: go.d
+            - name: configmap
+              mountPath: /etc/netdata/go.d/httpcheck.conf
+              subPath: httpcheck
+            - name: configmap
+              mountPath: /etc/netdata/go.d/dns_query.conf
+              subPath: dnsquery
+            - name: configmap
+              mountPath: /etc/netdata/go.d/x509check.conf
+              subPath: x509check
+            - name: configmap
+              mountPath: /etc/netdata/go.d/k8s_state.conf
+              subPath: go.d-k8s_state
             - name: configmap
               mountPath: /etc/netdata/netdata.conf
               subPath: netdata
             - name: configmap
               mountPath: /etc/netdata/stream.conf
               subPath: stream
-            - name: database
-              mountPath: /var/cache/netdata
-            - name: alarms
+            - name: varlib
               mountPath: /var/lib/netdata
           resources: {}
-      terminationGracePeriodSeconds: 300
+      terminationGracePeriodSeconds: 30
       volumes:
         - name: os-release
           hostPath:
             path: /etc/os-release
         - name: configmap
           configMap:
-            name: netdata-conf-parent
+            name: netdata-conf-k8s-state
             optional: true
-        - name: database
+        - name: varlib
           persistentVolumeClaim:
-            claimName: netdata-parent-database
-        - name: alarms
-          persistentVolumeClaim:
-            claimName: netdata-parent-alarms
-      dnsPolicy: Default
+            claimName: netdata-k8s-state-varlib
+      dnsPolicy: ClusterFirstWithHostNet
diff --git a/pvc.yaml b/pvc.yaml
index 97953b3..4855082 100644
--- a/pvc.yaml
+++ b/pvc.yaml
@@ -1,24 +1,10 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: netdata-parent-database
+  name: netdata-k8s-state-varlib
   labels:
     app: netdata
-    role: parent
-spec:
-  storageClassName: nfs-storage-intelligent
-  accessModes: ["ReadWriteOnce"]
-  resources:
-    requests:
-      storage: 15Gi
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: netdata-parent-alarms
-  labels:
-    app: netdata
-    role: parent
+    role: k8sState
 spec:
   storageClassName: nfs-storage-intelligent
   accessModes: ["ReadWriteOnce"]