diff --git a/charts/hstreamdb/templates/hstreamdb.yaml b/charts/hstreamdb/templates/hstreamdb.yaml
index 066e079..507d11a 100644
--- a/charts/hstreamdb/templates/hstreamdb.yaml
+++ b/charts/hstreamdb/templates/hstreamdb.yaml
@@ -6,10 +6,9 @@ metadata:
   labels: {{ include "hstreamdb.labels" . | nindent 4 }}
 spec:
   config:
-    logDeviceConfig:
-      {{- with .Values.logDeviceConfig }}
-      {{- toYaml . | nindent 6 }}
-      {{- end }}
+    {{- with .Values.clusterConfig }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   hserver:
     image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
     imagePullPolicy: {{ .Values.image.pullPolicy }}
diff --git a/charts/hstreamdb/values.yaml b/charts/hstreamdb/values.yaml
index d84dec3..5d034da 100644
--- a/charts/hstreamdb/values.yaml
+++ b/charts/hstreamdb/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: hstreamdb/hstream
-  tag: rqlite_v0.17.3
+  tag: rqlite
   pullPolicy: IfNotPresent
 
 imagePullSecrets: []
@@ -70,8 +70,8 @@ tolerations: []
 
 affinity: {}
 
-logDeviceConfig:
-  # version: 2
+clusterConfig:
+  logDeviceConfig:
 
 hserver:
   # Name of the hserver component.
@@ -113,7 +113,7 @@ console:
   enabled: false
   # Name of the console component.
   name: hstreamdb-console
-  image: hstreamdb/hstream-console:v1.0.0-beta7
+  image: hstreamdb/hstream-kafka-console
   replicaCount: 1
   env:
   servicePorts: