diff --git a/k8s_01/templates/configmap.yaml b/k8s_01/templates/configmap.yaml
index 1b2b6c7..c8a21c2 100644
--- a/k8s_01/templates/configmap.yaml
+++ b/k8s_01/templates/configmap.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config
-  namespace: {{.Values.namespace}}
+  namespace: {{.Release.Namespace}}
 data:
   config.json: |-
     {{toJson .Values.config}}
diff --git a/k8s_01/templates/daemonset.yaml b/k8s_01/templates/daemonset.yaml
index 5156eeb..0f4b4e7 100644
--- a/k8s_01/templates/daemonset.yaml
+++ b/k8s_01/templates/daemonset.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: kubelogreader
-  namespace: {{.Values.namespace}}
+  namespace: {{.Release.Namespace}}
   labels:
     app: k8s_01
     host: kubelogreader
@@ -25,8 +25,9 @@ spec:
         - configMap:
             name: config
           name: config
-        - persistentVolumeClaim:
-            claimName: statestore-pvc
+        - hostPath:
+            path: {{.Values.statestore.hostMountPath}}
+            type: DirectoryOrCreate
           name: statestore
         - hostPath:
             path: /var/log/containers
diff --git a/k8s_01/templates/pv.yaml b/k8s_01/templates/pv.yaml
deleted file mode 100644
index 6f4636e..0000000
--- a/k8s_01/templates/pv.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: statestore-pv
-  namespace: {{.Values.namespace}}
-  labels:
-    type: local
-spec:
-  storageClassName: ""
-  capacity:
-    storage: 1Gi
-  accessModes:
-    - ReadWriteOnce
-  hostPath:
-    path: "/opt/teragrep/k8s_01/var"
diff --git a/k8s_01/templates/pvc.yaml b/k8s_01/templates/pvc.yaml
deleted file mode 100644
index 395220c..0000000
--- a/k8s_01/templates/pvc.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: statestore-pvc
-  namespace: {{.Values.namespace}}
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
diff --git a/k8s_01/templates/role.yaml b/k8s_01/templates/role.yaml
index a0c53fc..81bcaf4 100644
--- a/k8s_01/templates/role.yaml
+++ b/k8s_01/templates/role.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  namespace: {{.Values.namespace}}
+  namespace: {{.Release.Namespace}}
   name: kubelogreader
 rules:
 - apiGroups:
diff --git a/k8s_01/templates/rolebinding.yaml b/k8s_01/templates/rolebinding.yaml
index a514760..4f1de22 100644
--- a/k8s_01/templates/rolebinding.yaml
+++ b/k8s_01/templates/rolebinding.yaml
@@ -2,11 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: kubelogreader
-  namespace: {{.Values.namespace}}
+  namespace: {{.Release.Namespace}}
 subjects:
   - kind: ServiceAccount
     name: kubelogreader
-    namespace: {{.Values.namespace}}
+    namespace: {{.Release.Namespace}}
 roleRef:
   kind: ClusterRole
   name: kubelogreader
diff --git a/k8s_01/templates/service.yaml b/k8s_01/templates/service.yaml
index 1106435..ecc712b 100644
--- a/k8s_01/templates/service.yaml
+++ b/k8s_01/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: metrics-service
+  namespace: {{.Release.Namespace}}
   labels:
     app: k8s_01
     host: kubelogreader
diff --git a/k8s_01/templates/serviceaccount.yaml b/k8s_01/templates/serviceaccount.yaml
index 0601486..7c33eb2 100644
--- a/k8s_01/templates/serviceaccount.yaml
+++ b/k8s_01/templates/serviceaccount.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: kubelogreader
-  namespace: {{.Values.namespace}}
+  namespace: {{.Release.Namespace}}
diff --git a/k8s_01/values.yaml b/k8s_01/values.yaml
index 168faed..ad322ab 100644
--- a/k8s_01/values.yaml
+++ b/k8s_01/values.yaml
@@ -77,10 +77,12 @@ config:
 logging:
   level: INFO
 
-# Which namespace it will be installed to.
-namespace: teragrep
-
 # Keystore related
 keystore:
   # Which secret is passed to the container
   secretName: keystore
+
+# Statestore related
+statestore:
+  # Where statestore is mounted on the host
+  hostMountPath: /srv/k8s_01/statestore