diff --git a/charts/incubator/cura-novnc/.helmignore b/charts/stable/cura-novnc/.helmignore
similarity index 100%
rename from charts/incubator/cura-novnc/.helmignore
rename to charts/stable/cura-novnc/.helmignore
diff --git a/charts/incubator/cura-novnc/CHANGELOG.md b/charts/stable/cura-novnc/CHANGELOG.md
similarity index 100%
rename from charts/incubator/cura-novnc/CHANGELOG.md
rename to charts/stable/cura-novnc/CHANGELOG.md
diff --git a/charts/incubator/cura-novnc/Chart.yaml b/charts/stable/cura-novnc/Chart.yaml
similarity index 89%
rename from charts/incubator/cura-novnc/Chart.yaml
rename to charts/stable/cura-novnc/Chart.yaml
index 566dbd610d4..144209a7323 100644
--- a/charts/incubator/cura-novnc/Chart.yaml
+++ b/charts/stable/cura-novnc/Chart.yaml
@@ -1,8 +1,3 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - HomeAutomation
-    - Productivity
 apiVersion: v2
 appVersion: "latest"
 dependencies:
@@ -10,7 +5,7 @@ dependencies:
     repository: https://library-charts.truecharts.org
     version: 10.9.7
 deprecated: false
-description: "Enjoy Cura directly in your browser with this easy to use Chart Chart."
+description: Enjoy Cura directly in your browser with this easy to use Chart
 home: https://truecharts.org/docs/charts/incubator/cura-novnc
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/cura-novnc.png
 keywords:
@@ -28,4 +23,9 @@ sources:
   - https://ultimaker.com/software/ultimaker-cura
   - https://hub.docker.com/r/mikeah/cura-novnc
 type: application
-version: 1.0.4
+version: 2.0.0
+annotations:
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/catagories: |
+    - HomeAutomation
+    - Productivity
diff --git a/charts/incubator/cura-novnc/README.md b/charts/stable/cura-novnc/README.md
similarity index 100%
rename from charts/incubator/cura-novnc/README.md
rename to charts/stable/cura-novnc/README.md
diff --git a/charts/incubator/cura-novnc/icon.png b/charts/stable/cura-novnc/icon.png
similarity index 100%
rename from charts/incubator/cura-novnc/icon.png
rename to charts/stable/cura-novnc/icon.png
diff --git a/charts/incubator/cura-novnc/questions.yaml b/charts/stable/cura-novnc/questions.yaml
similarity index 72%
rename from charts/incubator/cura-novnc/questions.yaml
rename to charts/stable/cura-novnc/questions.yaml
index b9a10845116..010d879f11d 100644
--- a/charts/incubator/cura-novnc/questions.yaml
+++ b/charts/stable/cura-novnc/questions.yaml
@@ -11,8 +11,8 @@ questions:
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
-          label: "Main Service"
-          description: "The Primary service on which the healthcheck runs, often the webUI"
+          label: Main Service
+          description: The Primary service on which the healthcheck runs, often the webUI
           schema:
             additional_attrs: true
             type: dict
@@ -20,17 +20,17 @@ questions:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
                     - variable: main
-                      label: "Main Service Port Configuration"
+                      label: Main Service Port Configuration
                       schema:
                         additional_attrs: true
                         type: dict
                         attrs:
                           - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
+                            label: Port
+                            description: This port exposes the container port on the service
                             schema:
                               type: int
-                              default: 6080
+                              default: 16081
                               required: true
 # Include{serviceExpertRoot}
             default: false
@@ -38,16 +38,16 @@ questions:
 # Include{serviceList}
 # Include{persistenceRoot}
         - variable: homefolder
-          label: "homefolder Storage"
-          description: "Container Path homecura"
+          label: Main Container Storage
+          description: Main Container Storage
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{persistenceBasic}
         - variable: prints
-          label: "prints Storage"
-          description: "3D Printing Folder"
+          label: Prints or File Storage
+          description: 3D Printing Folder
           schema:
             additional_attrs: true
             type: dict
@@ -56,7 +56,7 @@ questions:
 # Include{persistenceList}
 # Include{ingressRoot}
         - variable: main
-          label: "Main Ingress"
+          label: Main Ingress
           schema:
             additional_attrs: true
             type: dict
@@ -68,41 +68,41 @@ questions:
 # Include{security}
 # Include{securityContextAdvancedRoot}
               - variable: privileged
-                label: "Privileged mode"
+                label: Privileged mode
                 schema:
                   type: boolean
                   default: false
               - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                label: ReadOnly Root Filesystem
                 schema:
                   type: boolean
                   default: false
               - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                label: Allow Privilege Escalation
                 schema:
                   type: boolean
                   default: false
               - variable: runAsNonRoot
-                label: "runAsNonRoot"
+                label: runAsNonRoot
                 schema:
                   type: boolean
                   default: false
 # Include{podSecurityContextRoot}
         - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
+          label: runAsUser
+          description: The UserID of the user running the application
           schema:
             type: int
             default: 0
         - variable: runAsGroup
-          label: "runAsGroup"
-          description: The groupID this App of the user running the application"
+          label: runAsGroup
+          description: The groupID this App of the user running the application
           schema:
             type: int
             default: 0
         - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
+          label: fsGroup
+          description: The group that should own ALL storage.
           schema:
             type: int
             default: 568
diff --git a/charts/incubator/cura-novnc/templates/common.yaml b/charts/stable/cura-novnc/templates/common.yaml
similarity index 100%
rename from charts/incubator/cura-novnc/templates/common.yaml
rename to charts/stable/cura-novnc/templates/common.yaml
diff --git a/charts/incubator/cura-novnc/values.yaml b/charts/stable/cura-novnc/values.yaml
similarity index 91%
rename from charts/incubator/cura-novnc/values.yaml
rename to charts/stable/cura-novnc/values.yaml
index 13fa698c71e..6087cf7bcc9 100644
--- a/charts/incubator/cura-novnc/values.yaml
+++ b/charts/stable/cura-novnc/values.yaml
@@ -1,15 +1,7 @@
-env: {}
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/cura-novnc
   tag: latest@sha256:aaa2736d302604e76490ab15b39272f6ff8ae9f731852001ff14f045097c8fef
-persistence:
-  homefolder:
-    enabled: true
-    mountPath: /home/cura/
-  prints:
-    enabled: true
-    mountPath: /prints/
 podSecurityContext:
   runAsGroup: 0
   runAsUser: 0
@@ -20,9 +12,17 @@ service:
   main:
     ports:
       main:
-        port: 6080
-        protocol: TCP
+        port: 16081
+        protocol: HTTP
         targetPort: 8080
 
+persistence:
+  homefolder:
+    enabled: true
+    mountPath: /home/cura/
+  prints:
+    enabled: true
+    mountPath: /prints/
+
 portal:
   enabled: true