diff --git a/charts/incubator/shiori/Chart.yaml b/charts/incubator/shiori/Chart.yaml
index 4eb5cbd3c13..95208c12811 100644
--- a/charts/incubator/shiori/Chart.yaml
+++ b/charts/incubator/shiori/Chart.yaml
@@ -3,11 +3,7 @@ appVersion: "1.5.4"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 11.1.2
-  - condition: postgresql.enabled
-    name: postgresql
-    repository: https://deps.truecharts.org/
-    version: 11.0.31
+    version: 14.0.1
 deprecated: false
 description: A simple bookmark manager built with Go.
 home: https://truecharts.org/charts/incubator/shiori
@@ -28,7 +24,7 @@ sources:
   - https://github.com/go-shiori/shiori
   - https://github.com/go-shiori/shiori/pkgs/container/shiori
 type: application
-version: 12.0.0
+version: 13.0.0
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/incubator/shiori/templates/_secret.tpl b/charts/incubator/shiori/templates/_secret.tpl
deleted file mode 100644
index 271799e2411..00000000000
--- a/charts/incubator/shiori/templates/_secret.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{/* Define the secret */}}
-{{- define "shiori.secret" -}}
-
-{{- $secretName := printf "%s-secret" (include "tc.common.names.fullname" .) }}
-
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ $secretName }}
-  labels:
-    {{- include "tc.common.labels" . | nindent 4 }}
-stringData:
-  SHIORI_DIR: {{ .Values.persistence.data.mountPath }}
-
-  {{/* Database */}}
-  SHIORI_DBMS: "postgresql"
-  SHIORI_PG_PORT: "5432"
-  SHIORI_PG_USER: {{ .Values.postgresql.postgresqlUsername }}
-  SHIORI_PG_PASS: {{ .Values.postgresql.postgresqlPassword | trimAll "\"" }}
-  SHIORI_PG_NAME: {{ .Values.postgresql.postgresqlDatabase }}
-  SHIORI_PG_HOST: {{ .Values.postgresql.url.plain | trimAll "\"" }}
-{{- end -}}
diff --git a/charts/incubator/shiori/templates/common.yaml b/charts/incubator/shiori/templates/common.yaml
index 160ab84e33b..b51394e00a4 100644
--- a/charts/incubator/shiori/templates/common.yaml
+++ b/charts/incubator/shiori/templates/common.yaml
@@ -1,8 +1 @@
-{{/* Make sure all variables are set properly */}}
-{{- include "tc.common.loader.init" . }}
-
-{{/* Render secret */}}
-{{- include "shiori.secret" . }}
-
-{{/* Render the templates */}}
-{{ include "tc.common.loader.apply" . }}
+{{ include "tc.v1.common.loader.all" . }}
diff --git a/charts/incubator/shiori/values.yaml b/charts/incubator/shiori/values.yaml
index 18005a9d50c..87c737c7930 100644
--- a/charts/incubator/shiori/values.yaml
+++ b/charts/incubator/shiori/values.yaml
@@ -1,12 +1,27 @@
 image:
   repository: tccr.io/truecharts/shiori
   pullPolicy: IfNotPresent
-  tag: 1.5.4@sha256:d0d145787855f00b81752433cb3cfa047c833926b55a14f845cbe8dbc42b8800
-
-envFrom:
-  - secretRef:
-      name: '{{ include "tc.common.names.fullname" . }}-secret'
+  tag: v1.5.5@sha256:2aa3fe6e09d5cb801e998a93f3f6ce13e0e7f8e75d567666a800939c6be3a474
 
+workload:
+  main:
+    podSpec:
+      containers:
+        main:
+          env:
+            SHIORI_DIR: "{{ .Values.persistence.data.mountPath }}"
+            SHIORI_DBMS: "postgresql"
+            SHIORI_PG_PORT: "5432"
+            SHIORI_PG_USER: "{{ .Values.cnpg.main.user }}"
+            SHIORI_PG_NAME: "{{ .Values.cnpg.main.database }}"
+            SHIORI_PG_HOST:
+              secretKeyRef:
+                name: cnpg-main-urls
+                key: host
+            SHIORI_PG_PASS:
+              secretKeyRef:
+                name: cnpg-main-user
+                key: password
 service:
   main:
     ports:
@@ -18,14 +33,13 @@ persistence:
   data:
     enabled: true
     mountPath: /data
-  varrun:
-    enabled: true
 
-postgresql:
-  enabled: true
-  existingSecret: dbcreds
-  postgresqlUsername: shiori
-  postgresqlDatabase: shiori
+cnpg:
+  main:
+    enabled: true
+    user: shiori
+    password: shiori
 
 portal:
-  enabled: true
+  open:
+    enabled: true