diff --git a/charts/incubator/kaizoku/Chart.yaml b/charts/incubator/kaizoku/Chart.yaml
index d2c3e655aaf..75f486a5152 100644
--- a/charts/incubator/kaizoku/Chart.yaml
+++ b/charts/incubator/kaizoku/Chart.yaml
@@ -3,13 +3,13 @@ appVersion: "1.6.1"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 14.0.1
+    version: 14.0.3
   - condition: redis.enabled
     name: redis
     repository: https://deps.truecharts.org
-    version: 6.0.66
+    version: 7.0.6
 deprecated: false
-description: Kaizoku is self-hosted manga downloader.
+description: A self-hosted manga downloader.
 home: https://truecharts.org/charts/incubator/kaizoku
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/kaizoku.png
 keywords:
@@ -24,7 +24,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/kaizoku
   - https://github.com/oae/kaizoku
 type: application
-version: 0.0.1
+version: 0.1.0
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/incubator/kaizoku/templates/_secrets.tpl b/charts/incubator/kaizoku/templates/_secrets.tpl
deleted file mode 100644
index 2ab54ac74e4..00000000000
--- a/charts/incubator/kaizoku/templates/_secrets.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{/* Define the secrets */}}
-{{- define "kaizoku.secret" -}}
-
-{{- $user := .Values.cnpg.main.user -}}
-{{- $password := .Values.cnpg.main.creds.password | trimAll "\"" -}}
-{{- $host := .Values.cnpg.main.creds.host | trimAll "\""  -}}
-{{- $database := .Values.cnpg.main.database -}}
-
-kaizoku-secret:
-  enabled: true
-  data:
-    DATABASE_URL: {{ printf "postgresql://%v:%v@%v:5432/%v" $user $password $host $database }}
-{{- end -}}
diff --git a/charts/incubator/kaizoku/templates/common.yaml b/charts/incubator/kaizoku/templates/common.yaml
index 4e07d957094..b51394e00a4 100644
--- a/charts/incubator/kaizoku/templates/common.yaml
+++ b/charts/incubator/kaizoku/templates/common.yaml
@@ -1,11 +1 @@
-{{/* Make sure all variables are set properly */}}
-{{- include "tc.v1.common.loader.init" . }}
-
-{{- $secret := include "kaizoku.secret" . | fromYaml -}}
-{{- if $secret -}}
-  {{ $secret := (mustMergeOverwrite .Values.secret $secret) }}
-  {{- $_ := set .Values "secret" $secret -}}
-{{- end -}}
-
-{{/* Render the templates */}}
-{{ include "tc.v1.common.loader.apply" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/incubator/kaizoku/values.yaml b/charts/incubator/kaizoku/values.yaml
index 78e0c81de7c..3d79af581b7 100644
--- a/charts/incubator/kaizoku/values.yaml
+++ b/charts/incubator/kaizoku/values.yaml
@@ -26,13 +26,13 @@ workload:
             KAIZOKU_PORT: "{{ .Values.service.main.ports.main.port }}"
             DATABASE_URL:
               secretKeyRef:
-                name: kaizoku-secret
-                key: DATABASE_URL
+                name: cnpg-main-urls
+                key: std
             REDIS_HOST:
               secretKeyRef:
                 expandObjectName: false
                 name: '{{ printf "%s-%s" .Release.Name "rediscreds" }}'
-                key: url
+                key: plainhost
             REDIS_PORT: 6379
 
 persistence: