diff --git a/projects/octoprint/.gitignore b/projects/octoprint/.gitignore
new file mode 100644
index 00000000..68d68451
--- /dev/null
+++ b/projects/octoprint/.gitignore
@@ -0,0 +1 @@
+chart/charts
diff --git a/projects/octoprint/chart/templates/init_config.yaml b/projects/octoprint/chart/templates/init_config.yaml
index a74ed8dc..341a8bf7 100644
--- a/projects/octoprint/chart/templates/init_config.yaml
+++ b/projects/octoprint/chart/templates/init_config.yaml
@@ -8,7 +8,7 @@ data:
   init.sh: |
     #!/bin/bash
     if ! octoprint --version 2>/dev/null ; then
-      cd; mkdir tmp; tar xzf ${octoprint_ref}.tar.gz --strip-components 1 -C tmp ; cd tmp; pip install .
+      mkdir -p /octoprint/tmp ; wget -O- https://github.com/OctoPrint/OctoPrint/archive/refs/tags/1.8.1.tar.gz | tar -xz --strip-components 1 -C /octoprint/tmp ; cd /octoprint/tmp; pip install .
     fi
 {{- if .Values.octoprint.plugins.install }}
   {{- range .Values.octoprint.plugins.plugins }}
diff --git a/projects/octoprint/values/octoprint.yaml b/projects/octoprint/values/octoprint.yaml
index d418daa4..62b2c11d 100644
--- a/projects/octoprint/values/octoprint.yaml
+++ b/projects/octoprint/values/octoprint.yaml
@@ -1,10 +1,12 @@
-USER-SUPPLIED VALUES:
 env:
   TZ: UTC
+  OCTOPRINT_PORT: 5000
+
 image:
-  pullPolicy: IfNotPresent
-  repository: octoprint/octoprint
-  tag: 1.8.1
+  pullPolicy: Always
+  repository: nold360/octoprint
+  tag: "latest"
+
 ingress:
   main:
     annotations:
@@ -20,17 +22,13 @@ ingress:
       - path: /stream
         pathType: Prefix
         service:
-          name: octo2-octoprint-stream
+          name: octoprint-octoprint-stream
           port: 80
     tls:
     - hosts:
       - octo.dc
       secretName: octo-tls
-mjpg_streamer:
-  enabled: false
-  image: badsmoke/mjpg-streamer
-  imagePullPolicy: IfNotPresent
-  tag: latest
+
 octoprint:
   plugins:
     install: true
@@ -38,27 +36,37 @@ octoprint:
     - https://github.com/LazeMSS/OctoPrint-UICustomizer/archive/main.zip
     - https://github.com/NilsRo/OctoPrint-SlicerEstimator/archive/master.zip
     upgrade: true
+
 persistence:
   camera:
-    enabled: true
+    enabled: false
     hostPath: /dev/video0
     type: hostPath
+
   data:
     accessMode: ReadWriteOnce
     enabled: true
     mountPath: /octoprint
     size: 1Gi
     storageClass: local-path
+
   printer:
     enabled: true
     hostPath: /dev/ttyACM0
     type: hostPath
-podAnnotations:
-  prometheus.io/path: /plugin/prometheus_exporter/metrics
-  prometheus.io/port: "5000"
-  prometheus.io/scrape: "true"
+
+  #podAnnotations:
+      #prometheus.io/path: /plugin/prometheus_exporter/metrics
+      #prometheus.io/port: "5000"
+      #prometheus.io/scrape: "true"
+podSecurityContext:
+  runAsUser: 1000
+  runAsGroup: 20 #dialout
+  fsGroup: 20
+
 securityContext:
   privileged: true
+
 service:
   main:
     enabled: true
@@ -66,6 +74,7 @@ service:
       http:
         port: 80
         targetPort: 5000
+
   stream:
     enabled: true
     ports:
@@ -73,6 +82,7 @@ service:
         enabled: true
         port: 80
         targetPort: 8080
+
 streamer:
   device: /dev/video0
   encoder: CPU
@@ -81,8 +91,15 @@ streamer:
   port: 8080
   quality: 70
   resolution: 640x480
+
 ustreamer:
-  enabled: true
+  enabled: false
   image: lib42/ustreamer
   imagePullPolicy: IfNotPresent
   tag: latest
+
+mjpg_streamer:
+  enabled: false
+  image: badsmoke/mjpg-streamer
+  imagePullPolicy: IfNotPresent
+  tag: latest