diff --git a/charts/incubator/cloudbeaver/Chart.yaml b/charts/incubator/cloudbeaver/Chart.yaml
index f3d1e905c03..9ffb5253419 100644
--- a/charts/incubator/cloudbeaver/Chart.yaml
+++ b/charts/incubator/cloudbeaver/Chart.yaml
@@ -1,8 +1,8 @@
 kubeVersion: ">=1.24.0"
 apiVersion: v2
 name: cloudbeaver
-version: 2.0.19
-appVersion: latest
+version: 3.0.0
+appVersion: 23.3.0
 description: Cloud Database Manager (Official Chart)
 home: https://truecharts.org/charts/incubator/cloudbeaver
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/cloudbeaver.png
@@ -21,7 +21,7 @@ keywords:
   - Tools-Utilities
 dependencies:
   - name: common
-    version: 11.1.2
+    version: 16.0.0
     repository: https://library-charts.truecharts.org
     condition: ""
     alias: ""
diff --git a/charts/incubator/cloudbeaver/questions.yaml b/charts/incubator/cloudbeaver/questions.yaml
index 02236048789..4979cb2cd4a 100644
--- a/charts/incubator/cloudbeaver/questions.yaml
+++ b/charts/incubator/cloudbeaver/questions.yaml
@@ -6,34 +6,28 @@ questions:
 # Include{global}
 # Include{workload}
 # Include{workloadDeployment}
-
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
+
 # 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: 8978
@@ -42,9 +36,9 @@ questions:
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}
-        - variable: appdata
-          label: "appdata Storage"
-          description: "Container Path optcloudbeaverworkspace"
+        - variable: workspace
+          label: App Workspace Storage
+          description: Stores the Application Workspace.
           schema:
             additional_attrs: true
             type: dict
diff --git a/charts/incubator/cloudbeaver/templates/NOTES.txt b/charts/incubator/cloudbeaver/templates/NOTES.txt
new file mode 100644
index 00000000000..efcb74cb772
--- /dev/null
+++ b/charts/incubator/cloudbeaver/templates/NOTES.txt
@@ -0,0 +1 @@
+{{- include "tc.v1.common.lib.chart.notes" $ -}}
diff --git a/charts/incubator/cloudbeaver/templates/common.yaml b/charts/incubator/cloudbeaver/templates/common.yaml
index cbf66c20818..b51394e00a4 100644
--- a/charts/incubator/cloudbeaver/templates/common.yaml
+++ b/charts/incubator/cloudbeaver/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/cloudbeaver/values.yaml b/charts/incubator/cloudbeaver/values.yaml
index 2e9372bb405..b4c8148f194 100644
--- a/charts/incubator/cloudbeaver/values.yaml
+++ b/charts/incubator/cloudbeaver/values.yaml
@@ -1,25 +1,28 @@
-env: {}
 image:
   pullPolicy: IfNotPresent
-  repository: tccr.io/truecharts/cloudbeaver
-  tag: latest@sha256:819648653a00b7dea42d204b6d3cf2128381c98c7336188981a4ec5a5cd79119
-persistence:
-  appdata:
-    enabled: true
-    mountPath: /opt/cloudbeaver/workspace
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
+  repository: dbeaver/cloudbeaver
+  tag: 23.3.0@sha256:4ec08435112630177c9ce78f78bb4313668844f40d6f2a51b7ab92463412a04e
+
 securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
+  container:
+    runAsNonRoot: false
+    readOnlyRootFilesystem: false
+    runAsUser: 0
+    runAsGroup: 0
+
 service:
   main:
     ports:
       main:
         port: 8978
-        protocol: TCP
+        protocol: http
         targetPort: 8978
 
+persistence:
+  workspace:
+    enabled: true
+    mountPath: /opt/cloudbeaver/workspace
+
 portal:
-  enabled: true
+  open:
+    enabled: true