diff --git a/charts/incubator/filestash/Chart.yaml b/charts/incubator/filestash/Chart.yaml
index c99cd1bc3c8..055f28d42a9 100644
--- a/charts/incubator/filestash/Chart.yaml
+++ b/charts/incubator/filestash/Chart.yaml
@@ -1,17 +1,11 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - Cloud
-    - Productivity
-    - Network-Web
 apiVersion: v2
 appVersion: "latest"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 14.0.9
 deprecated: false
-description: A modern web client for SFTP, S3, FTP, WebDAV, Git, Minio, LDAP, CalDAV, CardDAV, Mysql, Backblaze, ...
+description: A Dropbox-like file manager that let you manage your data anywhere it is located.
 home: https://truecharts.org/charts/incubator/filestash
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/filestash.png
 keywords:
@@ -27,6 +21,11 @@ maintainers:
 name: filestash
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/filestash
+  - https://github.com/mickael-kerjean/filestash
   - https://www.filestash.app/
 type: application
-version: 2.0.17
+version: 3.0.0
+annotations:
+  truecharts.org/catagories: |
+    - Cloud
+  truecharts.org/SCALE-support: "true"
diff --git a/charts/incubator/filestash/questions.yaml b/charts/incubator/filestash/questions.yaml
index 9d1f5e11c39..b118f2b7f44 100644
--- a/charts/incubator/filestash/questions.yaml
+++ b/charts/incubator/filestash/questions.yaml
@@ -10,29 +10,59 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
+
+                                - variable: env
+                                  label: Image Environment
+                                  schema:
+                                    additional_attrs: true
+                                    type: dict
+                                    attrs:
+                                      - variable: APPLICATION_URL
+                                        label: Application Url
+                                        description: "Configure it either as http://ip:port or as https://mydomain.tld."
+                                        schema:
+                                          type: string
+                                          required: true
+                                          default: "http://localhost:8334"
+                                      - variable: GDRIVE_CLIENT_ID
+                                        label: Google Drive Client ID
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: GDRIVE_CLIENT_SECRET
+                                        label: Google Drive Client Secret
+                                        schema:
+                                          type: string
+                                          private: true
+                                          default: ""
+                                      - variable: DROPBOX_CLIENT_ID
+                                        label: DropBox Client ID
+                                        schema:
+                                          type: string
+                                          default: ""
+                                      - variable: ONLYOFFICE_URL
+                                        label: Only Office Url
+                                        schema:
+                                          type: string
+                                          default: ""
+
 # Include{containerBasic}
 # Include{containerAdvanced}
-
 # Include{containerConfig}
+# Include{podOptions}
 # Include{serviceRoot}
-        - variable: main
-          label: "Main Service"
-          description: "The Primary service on which the healthcheck runs, often the webUI"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
+# Include{serviceMain}
 # 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: 8334
@@ -41,9 +71,9 @@ questions:
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}
-        - variable: appdata
-          label: "appdata Storage"
-          description: "Container Path appdatastate"
+        - variable: data
+          label: App Data Storage
+          description: Stores the Application Data.
           schema:
             additional_attrs: true
             type: dict
@@ -52,7 +82,7 @@ questions:
 # Include{persistenceList}
 # Include{ingressRoot}
         - variable: main
-          label: "Main Ingress"
+          label: Main Ingress
           schema:
             additional_attrs: true
             type: dict
@@ -65,14 +95,14 @@ questions:
 # Include{securityContextRoot}
 
               - 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 of the user running the application"
+                label: runAsGroup
+                description: The groupID this App of the user running the application
                 schema:
                   type: int
                   default: 0
@@ -80,8 +110,8 @@ questions:
 # Include{securityContextAdvanced}
 # Include{securityContextPod}
               - 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/filestash/templates/NOTES.txt b/charts/incubator/filestash/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/incubator/filestash/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/incubator/filestash/templates/common.yaml b/charts/incubator/filestash/templates/common.yaml
index cbf66c20818..b51394e00a4 100644
--- a/charts/incubator/filestash/templates/common.yaml
+++ b/charts/incubator/filestash/templates/common.yaml
@@ -1,2 +1 @@
-{{/* Render the templates */}}
-{{ include "tc.common.loader.all" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/incubator/filestash/values.yaml b/charts/incubator/filestash/values.yaml
index f274ce9553c..f90d58078a5 100644
--- a/charts/incubator/filestash/values.yaml
+++ b/charts/incubator/filestash/values.yaml
@@ -1,25 +1,40 @@
-env: {}
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/filestash
-  tag: latest@sha256:a541026ec3eaaa67cc568b4fffd006460965eb6a408a512d841d1c06213ea9eb
-persistence:
-  appdata:
-    enabled: true
-    mountPath: /app/data/state/
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
+  tag: latest@sha256:fdf1d947d1aeb0dcd2532dbbb4af1b8bae06e077e7fb9ce66b0a7d59ba18bd1e
+
 securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
+  container:
+    runAsNonRoot: false
+    readOnlyRootFilesystem: false
+    runAsUser: 0
+    runAsGroup: 0
+
 service:
   main:
     ports:
       main:
-        port: 8334
-        protocol: TCP
+        protocol: http
         targetPort: 8334
+        port: 8334
+
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          env:
+            APPLICATION_URL: "http://localhost:8334"
+            GDRIVE_CLIENT_ID: ""
+            GDRIVE_CLIENT_SECRET: ""
+            DROPBOX_CLIENT_ID: ""
+            ONLYOFFICE_URL: ""
+
+persistence:
+  data:
+    enabled: true
+    mountPath: /app/data/state
 
 portal:
-  enabled: true
+  open:
+    enabled: true