diff --git a/charts/incubator/owntracks/Chart.yaml b/charts/incubator/owntracks/Chart.yaml
index 3ee56eee28c..3a4f7d17a10 100644
--- a/charts/incubator/owntracks/Chart.yaml
+++ b/charts/incubator/owntracks/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "0.9.3"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
+    version: 13.2.1
 deprecated: false
 description: The OwnTracks Recorder is a lightweight program for storing and accessing location data published via MQTT (or HTTP) by the OwnTracks apps.
 home: https://truecharts.org/charts/incubator/owntracks
@@ -22,7 +22,7 @@ sources:
   - https://github.com/owntracks/recorder
   - https://github.com/owntracks/docker-recorder
 type: application
-version: 0.0.7
+version: 1.0.0
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/incubator/owntracks/questions.yaml b/charts/incubator/owntracks/questions.yaml
index 6fc16945f27..44b1fb193bc 100644
--- a/charts/incubator/owntracks/questions.yaml
+++ b/charts/incubator/owntracks/questions.yaml
@@ -114,6 +114,14 @@ questions:
             additional_attrs: true
             type: dict
             attrs:
+# Include{persistenceBasic}
+        - variable: config
+          label: App Storage
+          description: Stores the config data.
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
 # Include{persistenceBasic}
 # Include{persistenceList}
 # Include{ingressRoot}
@@ -128,29 +136,29 @@ questions:
 # Include{ingressTraefik}
 # Include{ingressAdvanced}
 # Include{ingressList}
-# Include{securityContextRoot}
 
-        - variable: runAsUser
-          label: runAsUser
-          description: The UserID of the user running the application
-          schema:
-            type: int
-            default: 568
-        - variable: runAsGroup
-          label: runAsGroup
-          description: The groupID this App of the user running the application
-          schema:
-            type: int
-            default: 568
+# Include{securityContextRoot}
+              - variable: runAsUser
+                label: "runAsUser"
+                description: "The UserID of the user running the application"
+                schema:
+                  type: int
+                  default: 568
+              - variable: runAsGroup
+                label: "runAsGroup"
+                description: "The groupID of the user running the application"
+                schema:
+                  type: int
+                  default: 568
 # Include{securityContextContainer}
 # Include{securityContextAdvanced}
 # Include{securityContextPod}
-        - variable: fsGroup
-          label: fsGroup
-          description: The group that should own ALL storage.
-          schema:
-            type: int
-            default: 568
+              - variable: fsGroup
+                label: "fsGroup"
+                description: "The group that should own ALL storage."
+                schema:
+                  type: int
+                  default: 568
 
 # Include{resources}
 # Include{advanced}
diff --git a/charts/incubator/owntracks/templates/NOTES.txt b/charts/incubator/owntracks/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/incubator/owntracks/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/incubator/owntracks/templates/_secret.tpl b/charts/incubator/owntracks/templates/_secret.tpl
index 00c3149236d..ac63181a6ae 100644
--- a/charts/incubator/owntracks/templates/_secret.tpl
+++ b/charts/incubator/owntracks/templates/_secret.tpl
@@ -1,16 +1,8 @@
 {{/* Define the configmap */}}
 {{- define "owntracks.secret" -}}
 
-{{- $configName := printf "%s-secret" (include "tc.common.names.fullname" .) }}
----
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: {{ $configName }}
-  labels:
-    {{- include "tc.common.labels" . | nindent 4 }}
-stringData:
+enabled: true
+data:
   OTR_HTTPPORT: {{ .Values.service.main.ports.main.port | quote }}
   {{- with .Values.owntracks.otr_host }}
   OTR_HOST: {{ . | quote }}
diff --git a/charts/incubator/owntracks/templates/common.yaml b/charts/incubator/owntracks/templates/common.yaml
index c7672cba5d5..500eb7b7cb4 100644
--- a/charts/incubator/owntracks/templates/common.yaml
+++ b/charts/incubator/owntracks/templates/common.yaml
@@ -1,8 +1,11 @@
 {{/* Make sure all variables are set properly */}}
-{{- include "tc.common.loader.init" . }}
+{{- include "tc.v1.common.loader.init" . }}
 
-{{/* Render secret */}}
-{{- include "owntracks.secret" . }}
+{{/* Render secrets for owntracks */}}
+{{- $secret := include "owntracks.secret" . | fromYaml -}}
+{{- if $secret -}}
+  {{- $_ := set .Values.secret "secret" $secret -}}
+{{- end -}}
 
 {{/* Render the templates */}}
-{{ include "tc.common.loader.apply" . }}
+{{ include "tc.v1.common.loader.apply" . }}
diff --git a/charts/incubator/owntracks/values.yaml b/charts/incubator/owntracks/values.yaml
index 1e1437fbe81..5fe8e7cc960 100644
--- a/charts/incubator/owntracks/values.yaml
+++ b/charts/incubator/owntracks/values.yaml
@@ -3,8 +3,6 @@ image:
   pullPolicy: IfNotPresent
   tag: 0.9.3@sha256:797eb8958677b80bbb438251f75a51984b578c4919f0fe2c3a9bbf0e866a8b43
 
-# securityContext:
-#  readOnlyRootFilesystem: false
 
 owntracks:
   otr_host: ""
@@ -17,44 +15,44 @@ owntracks:
   otr_serverlabel: OwnTracks
   otr_lmdbsize: 104857600000
 
-envFrom:
-  - secretRef:
-      name: '{{ include "tc.common.names.fullname" . }}-secret'
 
 service:
   main:
     ports:
       main:
-        protocol: HTTP
         port: 8083
+        protocol: http
 
-probes:
-  liveness:
-    enabled: true
-    custom: true
-    spec:
-      exec:
-        command:
-          - /usr/sbin/recorder-health.sh
-  readiness:
-    enabled: true
-    custom: true
-    spec:
-      exec:
-        command:
-          - /usr/sbin/recorder-health.sh
-  startup:
-    enabled: true
-    custom: true
-    spec:
-      exec:
-        command:
-          - /usr/sbin/recorder-health.sh
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          probes:
+            liveness:
+              enabled: true
+              type: exec
+              command: /usr/sbin/recorder-health.sh
+            readiness:
+              enabled: true
+              type: exec
+              command: /usr/sbin/recorder-health.sh
+            startup:
+              enabled: true
+              type: exec
+              command: /usr/sbin/recorder-health.sh
+          envFrom:
+            - secretRef:
+                name: "secret"
 
 persistence:
   store:
     enabled: true
     mountPath: /store
+  config:
+    enabled: true
+    mountPath: /config
 
 portal:
-  enabled: true
+  open:
+    enabled: true