diff --git a/charts/incubator/autoscan/.helmignore b/charts/stable/autoscan/.helmignore
similarity index 100%
rename from charts/incubator/autoscan/.helmignore
rename to charts/stable/autoscan/.helmignore
diff --git a/charts/incubator/autoscan/CHANGELOG.md b/charts/stable/autoscan/CHANGELOG.md
similarity index 100%
rename from charts/incubator/autoscan/CHANGELOG.md
rename to charts/stable/autoscan/CHANGELOG.md
diff --git a/charts/incubator/autoscan/Chart.yaml b/charts/stable/autoscan/Chart.yaml
similarity index 64%
rename from charts/incubator/autoscan/Chart.yaml
rename to charts/stable/autoscan/Chart.yaml
index 8172339bddd..2d429dbb638 100644
--- a/charts/incubator/autoscan/Chart.yaml
+++ b/charts/stable/autoscan/Chart.yaml
@@ -1,29 +1,30 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - Other
 apiVersion: v2
+kubeVersion: ">=1.16.0-0"
+name: autoscan
+version: 1.0.0
 appVersion: "latest"
+description: Autoscan replaces the default Plex and Emby behaviour for picking up file changes on the file system.
+type: application
+deprecated: false
+home: https://truecharts.org/docs/charts/stable/autoscan
+icon: https://truecharts.org/img/hotlink-ok/chart-icons/autoscan.png
+keywords:
+  - autoscan
+  - media
+sources:
+  - https://github.com/truecharts/charts/tree/master/charts/stable/autoscan
+  - https://hotio.dev/containers/autoscan
+  - https://hub.docker.com/r/hotio/autoscan
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
     version: 10.5.9
-deprecated: false
-description: Autoscan replaces the default Plex and Emby behaviour for picking up file changes on the file system. Autoscan integrates with Sonarr, Radarr and Lidarr to fetch changes in near real-time without relying on the file system.
-home: https://truecharts.org/docs/charts/incubator/autoscan
-icon: https://truecharts.org/img/hotlink-ok/chart-icons/autoscan.png
-keywords:
-  - autoscan
-  - Other
-kubeVersion: ">=1.16.0-0"
 maintainers:
   - email: info@truecharts.org
     name: TrueCharts
     url: https://truecharts.org
-name: autoscan
-sources:
-  - https://github.com/truecharts/charts/tree/master/charts/incubator/autoscan
-  - https://hotio.dev/containers/autoscan
-  - https://hub.docker.com/r/hotio/autoscan
-type: application
-version: 0.0.28
+annotations:
+  truecharts.org/catagories: |
+    - media
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U
diff --git a/charts/incubator/autoscan/README.md b/charts/stable/autoscan/README.md
similarity index 100%
rename from charts/incubator/autoscan/README.md
rename to charts/stable/autoscan/README.md
diff --git a/charts/incubator/autoscan/icon.png b/charts/stable/autoscan/icon.png
similarity index 100%
rename from charts/incubator/autoscan/icon.png
rename to charts/stable/autoscan/icon.png
diff --git a/charts/incubator/autoscan/questions.yaml b/charts/stable/autoscan/questions.yaml
similarity index 50%
rename from charts/incubator/autoscan/questions.yaml
rename to charts/stable/autoscan/questions.yaml
index 915be39b8e1..b30218151d1 100644
--- a/charts/incubator/autoscan/questions.yaml
+++ b/charts/stable/autoscan/questions.yaml
@@ -10,39 +10,65 @@ questions:
 # Include{recreate}
 # Include{controllerExpert}
 # Include{controllerExpertExtraArgs}
-  - variable: env
-    group: "Container Configuration"
-    label: "Image Environment"
+  - variable: secretEnv
+    group: Container Configuration
+    label: Image Secrets
     schema:
       additional_attrs: true
       type: dict
       attrs:
         - variable: PLEX_LOGIN
-          label: "PLEX_LOGIN"
-          description: "Container Variable PLEXLOGIN"
+          label: PLEX_LOGIN
+          description: Set plex username.
           schema:
             type: string
             default: ""
         - variable: PLEX_PASSWORD
-          label: "PLEX_PASSWORD"
-          description: "Container Variable PLEXPASSWORD"
+          label: PLEX_PASSWORD
+          description: Set plex password.
           schema:
             type: string
+            private: true
             default: ""
-        - variable: UMASK
-          label: "UMASK"
-          description: "Container Variable UMASK"
+# Include{containerConfig}
+# Include{serviceRoot}
+        - variable: main
+          label: Main Service
+          description: The Primary service on which the healthcheck runs, often the webUI
           schema:
-            type: string
-            default: ""
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{serviceSelectorSimple}
+# Include{serviceSelectorExtras}
+                    - variable: main
+                      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
+                            schema:
+                              type: int
+                              default: 3030
+                              required: true
+# Include{advancedPortHTTP}
+                                - variable: targetPort
+                                  label: Target Port
+                                  description: The internal(!) port on the container the Application runs on
+                                  schema:
+                                    type: int
+                                    default: 3030
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}
         - variable: config
-          label: "config Storage"
-          description: "Container Path config"
+          label: config Storage
+          description: Container Path config
           schema:
             additional_attrs: true
             type: dict
@@ -54,42 +80,42 @@ 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{securityContextAdvanced}
 # 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/autoscan/templates/common.yaml b/charts/stable/autoscan/templates/common.yaml
similarity index 100%
rename from charts/incubator/autoscan/templates/common.yaml
rename to charts/stable/autoscan/templates/common.yaml
diff --git a/charts/incubator/autoscan/values.yaml b/charts/stable/autoscan/values.yaml
similarity index 90%
rename from charts/incubator/autoscan/values.yaml
rename to charts/stable/autoscan/values.yaml
index c511ad8e389..419b99c3512 100644
--- a/charts/incubator/autoscan/values.yaml
+++ b/charts/stable/autoscan/values.yaml
@@ -1,18 +1,20 @@
-env:
-  PLEX_LOGIN: ""
-  PLEX_PASSWORD: ""
-  UMASK: ""
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/autoscan
   tag: latest@sha256:bda572ee500b9e613aa031d98127c12b32aaf663e4958c9c3c53a85bbb16f5a5
-persistence:
-  config:
-    enabled: true
-    mountPath: /config
+
 podSecurityContext:
   runAsGroup: 0
   runAsUser: 0
+
+securityContext:
+  readOnlyRootFilesystem: false
+  runAsNonRoot: false
+
+secretEnv:
+  PLEX_LOGIN: ""
+  PLEX_PASSWORD: ""
+
 probes:
   liveness:
     enabled: false
@@ -20,15 +22,18 @@ probes:
     enabled: false
   startup:
     enabled: false
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
+
 service:
   main:
-    enabled: false
     ports:
       main:
-        enabled: false
+        port: 3030
+        targetPort: 3030
+
+persistence:
+  config:
+    enabled: true
+    mountPath: /config
 
 portal:
   enabled: false
diff --git a/cspell.config.yaml b/cspell.config.yaml
index 8d4a29116b5..c2a901a2e22 100644
--- a/cspell.config.yaml
+++ b/cspell.config.yaml
@@ -15,6 +15,7 @@ words:
   - authtoken
   - autoconnect
   - autoplay
+  - autoscan
   - autosync
   - backupname
   - basicauthexample
@@ -42,6 +43,7 @@ words:
   - dockerized
   - duplicati
   - dynmap
+  - emby
   - ebgp
   - entrypoints
   - eptgmk