diff --git a/charts/incubator/backuppc/Chart.yaml b/charts/incubator/backuppc/Chart.yaml
index f883998b98c..8541941b8c0 100644
--- a/charts/incubator/backuppc/Chart.yaml
+++ b/charts/incubator/backuppc/Chart.yaml
@@ -1,16 +1,11 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - Backup
-    - Network-Web
 apiVersion: v2
-appVersion: "latest"
+appVersion: "6.0.2"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 14.0.3
 deprecated: false
-description: BackupPC is a high-performance, enterprise-grade system for backing up Linux, Windows and macOS PCs and laptops to a server's disk.
+description: A high-performance, enterprise-grade system for backing up Linux, Windows and macOS PCs and laptops to a server's disk.
 home: https://truecharts.org/charts/incubator/backuppc
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/backuppc.png
 keywords:
@@ -25,6 +20,12 @@ maintainers:
 name: backuppc
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/backuppc
+  - https://github.com/tiredofit/docker-backuppc
   - https://backuppc.github.io/backuppc/index.html
 type: application
-version: 2.0.16
+version: 3.0.0
+annotations:
+  truecharts.org/catagories: |
+    - Backup
+    - Network-Web
+  truecharts.org/SCALE-support: "true"
diff --git a/charts/incubator/backuppc/icon.png b/charts/incubator/backuppc/icon.png
index afefc70ea63..c2598552222 100644
Binary files a/charts/incubator/backuppc/icon.png and b/charts/incubator/backuppc/icon.png differ
diff --git a/charts/incubator/backuppc/questions.yaml b/charts/incubator/backuppc/questions.yaml
index 878df7e2f99..ccef4ea5d75 100644
--- a/charts/incubator/backuppc/questions.yaml
+++ b/charts/incubator/backuppc/questions.yaml
@@ -10,9 +10,84 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
+
 # Include{containerBasic}
 # Include{containerAdvanced}
 
+  - variable: backuppc
+    group: App Configuration
+    label: Backup PC
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: smtp
+          label: SMTP Configuration
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+              - variable: auto_from
+                label: Auto From
+                description: Add setting to support sending through Gmail SMTP.
+                schema:
+                  type: boolean
+                  default: false
+              - variable: host
+                label: SMTP Host
+                schema:
+                  type: string
+                  default: ""
+              - variable: port
+                label: SMTP Port
+                schema:
+                  type: int
+                  default: 25
+              - variable: domain
+                label: HELO Domain
+                schema:
+                  type: string
+                  default: ""
+              - variable: maildomain
+                label: Mail Domain From.
+                schema:
+                  type: string
+                  default: ""
+              - variable: auth
+                label: SMTP Authentication
+                schema:
+                  type: string
+                  default: "NONE"
+              - variable: user
+                label: SMTP Username
+                schema:
+                  type: string
+                  default: ""
+              - variable: pass
+                label: SMTP Password
+                schema:
+                  type: string
+                  private: true
+                  default: ""
+              - variable: tls
+                label: TLS
+                description: Use TLS.
+                schema:
+                  type: boolean
+                  default: false
+              - variable: starttls
+                label: StartTLS
+                description:     Start TLS from within session.
+                schema:
+                  type: boolean
+                  default: false
+              - variable: tlscertcheck
+                label: TLS Cert Check
+                description: Check remote certificate.
+                schema:
+                  type: boolean
+                  default: false
+
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
@@ -41,33 +116,33 @@ questions:
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}
-        - variable: backuplocation
-          label: "backuplocation Storage"
-          description: "Backup Location"
+        - variable: config
+          label: "App Config Storage"
+          description: "Stores the Application Configuration."
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{persistenceBasic}
-        - variable: configurationfiles
-          label: "configurationfiles Storage"
-          description: "Configuration Files"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{persistenceBasic}
-        - variable: homedirectory
-          label: "homedirectory Storage"
-          description: "Home Directory for Backuppc (SSH Keys)"
+        - variable: ssh
+          label: "App SSH Storage"
+          description: "Stores the Application SSH."
           schema:
             additional_attrs: true
             type: dict
             attrs:
 # Include{persistenceBasic}
         - variable: logs
-          label: "logs Storage"
-          description: "Logs"
+          label: "App Logs Storage"
+          description: "Stores the Application Logs."
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{persistenceBasic}
+        - variable: data
+          label: "App Data Storage"
+          description: "Stores the Application Data."
           schema:
             additional_attrs: true
             type: dict
@@ -96,7 +171,7 @@ questions:
                   default: 0
               - variable: runAsGroup
                 label: "runAsGroup"
-                description: "The groupID of the user running the application"
+                description: "The groupID this App of the user running the application"
                 schema:
                   type: int
                   default: 0
diff --git a/charts/incubator/backuppc/templates/NOTES.txt b/charts/incubator/backuppc/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/incubator/backuppc/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/incubator/backuppc/templates/common.yaml b/charts/incubator/backuppc/templates/common.yaml
index cbf66c20818..b51394e00a4 100644
--- a/charts/incubator/backuppc/templates/common.yaml
+++ b/charts/incubator/backuppc/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/backuppc/values.yaml b/charts/incubator/backuppc/values.yaml
index 565aa27ce78..362a83df917 100644
--- a/charts/incubator/backuppc/values.yaml
+++ b/charts/incubator/backuppc/values.yaml
@@ -1,34 +1,76 @@
-env: {}
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/backuppc
-  tag: latest@sha256:299db42e6562324141408027763266510dfec1d81a6af2e0aa6368bca498872d
-persistence:
-  backuplocation:
-    enabled: true
-    mountPath: /var/lib/backuppc
-  configurationfiles:
-    enabled: true
-    mountPath: /etc/backuppc
-  homedirectory:
-    enabled: true
-    mountPath: /home/backuppc
-  logs:
-    enabled: true
-    mountPath: /www/logs
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
+  tag: v6.0.2@sha256:80fe126415f0b530dd7d2645da23c8409f62f184a018c52a3ec1d8c5237d30ff
+
 securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
+  container:
+    runAsNonRoot: false
+    readOnlyRootFilesystem: false
+    runAsUser: 0
+    runAsGroup: 0
+
 service:
   main:
     ports:
       main:
-        port: 8000
-        protocol: TCP
+        protocol: http
         targetPort: 80
+        port: 8000
+
+backuppc:
+  smtp:
+    auto_from: false
+    host: postfix-relay
+    port: 25
+    domain: docker
+    maildomain: local
+    auth: none
+    user: ""
+    pass: ""
+    tls: false
+    starttls: false
+    tlscertcheck: false
+
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          env:
+            USER_BACKUPPC: "{{ .Values.securityContext.container.PUID }}"
+            GROUP_BACKUPPC: "{{ .Values.securityContext.pod.fsGroup }}"
+            CONFIG_PATH: "{{ .Values.persistence.config.mountPath }}"
+            LOG_PATH: "{{ .Values.persistence.logs.mountPath }}"
+            SSH_KEYS_PATH: "{{ .Values.persistence.ssh.mountPath }}"
+            DATA_PATH: "{{ .Values.persistence.data.mountPath }}"
+            # SMTP
+            SMTP_AUTO_FROM: "{{ .Values.backuppc.smtp.auto_from }}"
+            SMTP_HOST: "{{ .Values.backuppc.smtp.host }}"
+            SMTP_PORT: "{{ .Values.backuppc.smtp.port }}"
+            SMTP_DOMAIN: "{{ .Values.backuppc.smtp.domain }}"
+            SMTP_MAILDOMAIN: "{{ .Values.backuppc.smtp.maildomain }}"
+            SMTP_AUTHENTICATION: "{{ .Values.backuppc.smtp.auth }}"
+            SMTP_USER: "{{ .Values.backuppc.smtp.user }}"
+            SMTP_PASS: "{{ .Values.backuppc.smtp.pass }}"
+            SMTP_TLS: "{{ .Values.backuppc.smtp.tls }}"
+            SMTP_STARTTLS: "{{ .Values.backuppc.smtp.starttls }}"
+            SMTP_TLSCERTCHECK: "{{ .Values.backuppc.smtp.tlscertcheck }}"
+
+persistence:
+  config:
+    enabled: true
+    mountPath: /config
+  ssh:
+    enabled: true
+    mountPath: /.ssh
+  logs:
+    enabled: true
+    mountPath: /logs
+  data:
+    enabled: true
+    mountPath: /data
 
 portal:
-  enabled: true
+  open:
+    enabled: true