diff --git a/charts/incubator/sftpgo/Chart.yaml b/charts/incubator/sftpgo/Chart.yaml
index 6cd29f57179..2af73ac6906 100644
--- a/charts/incubator/sftpgo/Chart.yaml
+++ b/charts/incubator/sftpgo/Chart.yaml
@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/sftpgo
   - https://github.com/drakkan/sftpgo
 type: application
-version: 3.0.0
+version: 3.0.1
 annotations:
   truecharts.org/SCALE-support: "true"
   truecharts.org/catagories: |
diff --git a/charts/incubator/sftpgo/questions.yaml b/charts/incubator/sftpgo/questions.yaml
index c036bf52a4a..e9252c2bcb0 100644
--- a/charts/incubator/sftpgo/questions.yaml
+++ b/charts/incubator/sftpgo/questions.yaml
@@ -9,10 +9,6 @@ questions:
 
 # Include{replicas1}
 # Include{podSpec}
-# Include{containerMain}
-# Include{containerBasic}
-# Include{containerAdvanced}
-
 # Include{containerMain}
 
                                 - variable: env
@@ -60,6 +56,9 @@ questions:
                                       schema:
                                         type: string
                                         default: "0"
+# Include{containerBasic}
+# Include{containerAdvanced}
+
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
diff --git a/charts/incubator/sftpgo/values.yaml b/charts/incubator/sftpgo/values.yaml
index 9057b473952..56b3c9a26e2 100644
--- a/charts/incubator/sftpgo/values.yaml
+++ b/charts/incubator/sftpgo/values.yaml
@@ -3,34 +3,6 @@ image:
   repository: tccr.io/truecharts/sftpgo
   tag: v2.5.3@sha256:1a159663e5a9a2430edbf9b143fe8cab2998697bee9909598db32351c9de4f85
 
-workload:
-  main:
-    podSpec:
-      containers:
-        main:
-          env:
-            SFTPGO_COMMON__DEFENDER__ENABLED: "true"
-            SFTPGO_FTPD__BINDINGS__0__DEBUG: "0"
-            SFTPGO_FTPD__BINDINGS__0__FORCE_PASSIVE_IP: 10.0.0.10
-            SFTPGO_FTPD__BINDINGS__0__PORT: "2121"
-            SFTPGO_FTPD__PASSIVE_PORT_RANGE__END: "50100"
-            SFTPGO_FTPD__PASSIVE_PORT_RANGE__START: "50000"
-            SFTPGO_WEBDAVD__BINDINGS__0__PORT: "10080"
-
-persistence:
-  backupdirectory:
-    enabled: true
-    mountPath: /srv/sftpgo/backups
-  configpath:
-    enabled: true
-    mountPath: /var/lib/sftpgo
-  data:
-    enabled: true
-    mountPath: /srv/sftpgo/data
-  shareaccess:
-    enabled: true
-    mountPath: /shareaccess
-
 securityContext:
   container:
     runAsNonRoot: false
@@ -78,6 +50,34 @@ service:
         protocol: tcp
         targetPort: 10080
 
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          env:
+            SFTPGO_COMMON__DEFENDER__ENABLED: "true"
+            SFTPGO_FTPD__BINDINGS__0__DEBUG: "0"
+            SFTPGO_FTPD__BINDINGS__0__FORCE_PASSIVE_IP: 10.0.0.10
+            SFTPGO_FTPD__BINDINGS__0__PORT: "2121"
+            SFTPGO_FTPD__PASSIVE_PORT_RANGE__END: "50100"
+            SFTPGO_FTPD__PASSIVE_PORT_RANGE__START: "50000"
+            SFTPGO_WEBDAVD__BINDINGS__0__PORT: "10080"
+
+persistence:
+  backupdirectory:
+    enabled: true
+    mountPath: /srv/sftpgo/backups
+  configpath:
+    enabled: true
+    mountPath: /var/lib/sftpgo
+  data:
+    enabled: true
+    mountPath: /srv/sftpgo/data
+  shareaccess:
+    enabled: true
+    mountPath: /shareaccess
+
 portal:
   open:
     enabled: true