diff --git a/charts/incubator/crafty-4/Chart.yaml b/charts/incubator/crafty-4/Chart.yaml
index 9dab203a965..e278f78c420 100644
--- a/charts/incubator/crafty-4/Chart.yaml
+++ b/charts/incubator/crafty-4/Chart.yaml
@@ -1,8 +1,3 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - GameServers
-    - Other
 apiVersion: v2
 appVersion: "latest"
 dependencies:
@@ -10,7 +5,7 @@ dependencies:
     repository: https://library-charts.truecharts.org
     version: 10.7.7
 deprecated: false
-description: "Crafty 4 is the next iteration of our Minecraft Server Wrapper / Controller / Launcher. Boasting a clean new look, rebuilt from the ground up. Crafty 4 brings a whole host of new features such as Bedrock support. With SteamCMD support on the way!"
+description: Crafty 4 is the next iteration of our Minecraft Server Wrapper / Controller / Launcher.
 home: https://truecharts.org/docs/charts/incubator/crafty-4
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/crafty-4.png
 keywords:
@@ -26,6 +21,11 @@ name: crafty-4
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/crafty-4
   - https://craftycontrol.com/
-  - https://registry.hub.docker.com/r/registry.gitlab.com/crafty-controller/crafty-4
+  - https://gitlab.com/crafty-controller/crafty-4
 type: application
-version: 0.0.39
+annotations:
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/catagories: |
+    - GameServers
+    - minecraft
+version: 0.0.40
diff --git a/charts/incubator/crafty-4/docs/credentials.md b/charts/incubator/crafty-4/docs/credentials.md
new file mode 100644
index 00000000000..639b2d906b6
--- /dev/null
+++ b/charts/incubator/crafty-4/docs/credentials.md
@@ -0,0 +1,4 @@
+# Default Credentials
+
+- Username: `admin`
+- Password: `crafty`
diff --git a/charts/incubator/crafty-4/questions.yaml b/charts/incubator/crafty-4/questions.yaml
index 8e455463f8d..984ccea8c48 100644
--- a/charts/incubator/crafty-4/questions.yaml
+++ b/charts/incubator/crafty-4/questions.yaml
@@ -15,8 +15,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
@@ -24,109 +24,138 @@ 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: 8443
+                              default: 10586
                               required: true
 # Include{advancedPortHTTP}
                                 - variable: targetPort
-                                  label: "Target Port"
-                                  description: "The internal(!) port on the container the Application runs on"
+                                  label: Target Port
+                                  description: The internal(!) port on the container the Application runs on
                                   schema:
                                     type: int
-                                    default: 8443
-        - variable: minecraftports
-          label: 'minecraftports service'
-          description: "Container Port 25500-25600 yes, 100 ports for 100 possible Servers"
+                                    default: 8000
+        - variable: sub
+          label: Sub Service
+          description: The Sub service on which the healthcheck runs, often the webUI
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
-                    - variable: minecraftports
-                      label: "minecraftports Service Port Configuration"
+                    - variable: sub
+                      label: Sub 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: 8443
+                              required: true
+# Include{advancedPortHTTPS}
+                                - variable: targetPort
+                                  label: Target Port
+                                  description: The internal(!) port on the container the Application runs on
+                                  schema:
+                                    type: int
+                                    default: 8443
+        - variable: minecraft
+          label: Minecraft Service
+          description: Container Port 25500
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{serviceSelectorLoadBalancer}
+# Include{serviceSelectorExtras}
+                    - variable: minecraft
+                      label: Minecraft 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: 25500
                               required: true
 # Include{advancedPortTCP}
                                 - variable: targetPort
-                                  label: "Target Port"
-                                  description: "The internal(!) port on the container the Application runs on"
+                                  label: Target Port
+                                  description: The internal(!) port on the container the Application runs on
                                   schema:
                                     type: int
                                     default: 25500
-        - variable: portfordynmap
-          label: 'portfordynmap service'
-          description: "Dynmap Port"
+        - variable: dynmap
+          label: DynMap service
+          description: DynMap Port
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
-                    - variable: portfordynmap
-                      label: "portfordynmap Service Port Configuration"
+                    - variable: dynmap
+                      label: DynMap 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: 8123
                               required: true
 # Include{advancedPortTCP}
                                 - variable: targetPort
-                                  label: "Target Port"
-                                  description: "The internal(!) port on the container the Application runs on"
+                                  label: Target Port
+                                  description: The internal(!) port on the container the Application runs on
                                   schema:
                                     type: int
                                     default: 8123
-        - variable: portforbedrock
-          label: 'portforbedrock service'
-          description: "Bedrock server port"
+        - variable: bedrock
+          label: Bedrock Service
+          description: Bedrock Server Port
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
-                    - variable: portforbedrock
-                      label: "portforbedrock Service Port Configuration"
+                    - variable: bedrock
+                      label: Bedrock 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: 19132
                               required: true
 # Include{advancedPortUDP}
                                 - variable: targetPort
-                                  label: "Target Port"
-                                  description: "The internal(!) port on the container the Application runs on"
+                                  label: Target Port
+                                  description: The internal(!) port on the container the Application runs on
                                   schema:
                                     type: int
                                     default: 19132
@@ -135,18 +164,18 @@ questions:
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}
-        - variable: serverfiles
-          label: "serverfiles Storage"
-          description: "Path to the minecraft server folders"
+        - variable: config
+          label: Config Storage
+          description: Path to the persistent Crafty files
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{persistenceBasic}
 # Include{persistenceAdvanced}
-        - variable: backupfiles
-          label: "backupfiles Storage"
-          description: "Server Backups"
+        - variable: serverfiles
+          label: Server Files Storage
+          description: Path to the minecraft server folders
           schema:
             additional_attrs: true
             type: dict
@@ -154,26 +183,26 @@ questions:
 # Include{persistenceBasic}
 # Include{persistenceAdvanced}
         - variable: serverlogs
-          label: "serverlogs Storage"
-          description: "Logs"
+          label: Server Logs Storage
+          description: Logs
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{persistenceBasic}
 # Include{persistenceAdvanced}
-        - variable: config
-          label: "config Storage"
-          description: "Path to the persistent Crafty files"
+        - variable: import
+          label: Import Folder Storage
+          description: Import existing Mincecraft Servers
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{persistenceBasic}
 # Include{persistenceAdvanced}
-        - variable: importfolder
-          label: "importfolder Storage"
-          description: "Import existing Mincecraft Servers"
+        - variable: backup
+          label: Backup Storage
+          description: Server Backups
           schema:
             additional_attrs: true
             type: dict
@@ -183,7 +212,7 @@ questions:
 # Include{persistenceList}
 # Include{ingressRoot}
         - variable: main
-          label: "Main Ingress"
+          label: Main Ingress
           schema:
             additional_attrs: true
             type: dict
@@ -196,42 +225,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
+                  default: true
 # 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
+            default: 1000
         - 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
+            default: 1000
         - 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/crafty-4/values.yaml b/charts/incubator/crafty-4/values.yaml
index 1d21707dd7f..13aac3cb4ae 100644
--- a/charts/incubator/crafty-4/values.yaml
+++ b/charts/incubator/crafty-4/values.yaml
@@ -1,61 +1,80 @@
-env: {}
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/crafty-4
-  tag: latest@sha256:ab9217bf6fc3a8e2a660c65ba72d39d904497cb8770be07bb519a581bb665932
-persistence:
-  backupfiles:
+  tag: 4.0.16@sha256:6325ffbb4ee84693dc571f714a43ca0620e70d7f718771360599bd0bfc99b650
+
+podSecurityContext:
+  runAsGroup: 1000
+  runAsUser: 1000
+
+securityContext:
+  readOnlyRootFilesystem: false
+
+probes:
+  liveness:
+    type: HTTP
+    path: /
+  readiness:
+    type: HTTP
+    path: /
+  startup:
+    type: HTTP
+    path: /
+
+service:
+  main:
+    ports:
+      main:
+        port: 10586
+        protocol: HTTP
+        targetPort: 8000
+  sub:
     enabled: true
-    mountPath: /crafty/backups
+    ports:
+      sub:
+        enabled: true
+        port: 8443
+        protocol: HTTPS
+        targetPort: 8443
+  bedrock:
+    enabled: true
+    ports:
+      bedrock:
+        enabled: true
+        port: 19132
+        protocol: UDP
+        targetPort: 19132
+  dynmap:
+    enabled: true
+    ports:
+      dynmap:
+        enabled: true
+        port: 8123
+        targetPort: 8123
+  minecraft:
+    enabled: true
+    ports:
+      minecraft:
+        enabled: true
+        port: 25500
+        targetPort: 25500
+
+persistence:
   config:
     enabled: true
     mountPath: /crafty/app/config
-  importfolder:
-    enabled: true
-    mountPath: /crafty/import
   serverfiles:
     enabled: true
     mountPath: /crafty/servers
   serverlogs:
     enabled: true
     mountPath: /crafty/logs
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-service:
-  main:
-    ports:
-      main:
-        port: 8443
-        protocol: HTTP
-        targetPort: 8443
-  minecraftports:
+  import:
     enabled: true
-    ports:
-      minecraftports:
-        enabled: true
-        port: 25500
-        protocol: TCP
-        targetPort: 25500
-  portforbedrock:
+    mountPath: /crafty/import
+  backup:
     enabled: true
-    ports:
-      portforbedrock:
-        enabled: true
-        port: 19132
-        protocol: UDP
-        targetPort: 19132
-  portfordynmap:
-    enabled: true
-    ports:
-      portfordynmap:
-        enabled: true
-        port: 8123
-        protocol: TCP
-        targetPort: 8123
+    mountPath: /crafty/backups
 
 portal:
   enabled: true