diff --git a/monitor/.helmignore b/helm/.helmignore
similarity index 100%
rename from monitor/.helmignore
rename to helm/.helmignore
diff --git a/monitor/Chart.yaml b/helm/Chart.yaml
similarity index 100%
rename from monitor/Chart.yaml
rename to helm/Chart.yaml
diff --git a/monitor/templates/deploy.yaml b/helm/templates/deploy.yaml
similarity index 92%
rename from monitor/templates/deploy.yaml
rename to helm/templates/deploy.yaml
index 2496ca8..abfa3c6 100644
--- a/monitor/templates/deploy.yaml
+++ b/helm/templates/deploy.yaml
@@ -57,8 +57,6 @@ spec:
             name: hdd
           - mountPath: /tmp/nvme
             name: nvme
-          - mountPath: /tmp/usbssd
-            name: usbssd
 {{ end }}
 {{ if .Values.stress }}
       - name: stress
@@ -89,9 +87,6 @@ spec:
         - name: hdd
           persistentVolumeClaim:
             claimName: hdd-{{ .Release.Name }}
-        - name: usbssd
-          persistentVolumeClaim:
-            claimName: usbssd-{{ .Release.Name }}
         - name: nvme
           persistentVolumeClaim:
             claimName: nvme-{{ .Release.Name }}
diff --git a/monitor/templates/ingress.yaml b/helm/templates/ingress.yaml
similarity index 100%
rename from monitor/templates/ingress.yaml
rename to helm/templates/ingress.yaml
diff --git a/monitor/templates/pvc.yaml b/helm/templates/pvc.yaml
similarity index 60%
rename from monitor/templates/pvc.yaml
rename to helm/templates/pvc.yaml
index 9a466f2..7e535da 100644
--- a/monitor/templates/pvc.yaml
+++ b/helm/templates/pvc.yaml
@@ -4,7 +4,7 @@ kind: PersistentVolumeClaim
 metadata:
   name: hdd-{{ .Release.Name }}
 spec:
-  storageClassName: hdd
+  storageClassName: freenas-nfs-hdd
   accessModes:
     - ReadWriteOnce
   resources:
@@ -16,19 +16,7 @@ kind: PersistentVolumeClaim
 metadata:
   name: nvme-{{ .Release.Name }}
 spec:
-  storageClassName: nvme
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 16Gi
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: usbssd-{{ .Release.Name }}
-spec:
-  storageClassName: hdd
+  storageClassName: freenas-nfs-nvme
   accessModes:
     - ReadWriteOnce
   resources:
diff --git a/monitor/templates/service.yaml b/helm/templates/service.yaml
similarity index 100%
rename from monitor/templates/service.yaml
rename to helm/templates/service.yaml
diff --git a/helm/values.yaml b/helm/values.yaml
new file mode 100644
index 0000000..8a53e86
--- /dev/null
+++ b/helm/values.yaml
@@ -0,0 +1,7 @@
+image: hub.ducoterra.net/ducoterra/temp:0.0.10
+glances: true
+iperf: true
+disk: true
+stress: true
+stress_cpu: "48"
+exporter: true
\ No newline at end of file
diff --git a/monitor/values.yaml b/monitor/values.yaml
deleted file mode 100644
index ad2e24a..0000000
--- a/monitor/values.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-image: hub.ducoterra.net/ducoterra/temp:0.0.10
-glances: false
-iperf: false
-disk: false
-stress: false
-stress_cpu: "1"
-exporter: false
\ No newline at end of file