diff --git a/cassandra/templates/init_cm.yaml b/cassandra/templates/init_cm.yaml
index a411831..7a443c4 100644
--- a/cassandra/templates/init_cm.yaml
+++ b/cassandra/templates/init_cm.yaml
@@ -12,3 +12,5 @@ data:
     CREATE KEYSPACE IF NOT EXISTS messages WITH replication = {'class' : 'SimpleStrategy', 'replication_factor' : 3};
     CREATE KEYSPACE IF NOT EXISTS chats WITH replication = {'class' : 'SimpleStrategy', 'replication_factor' : 3};
     CREATE KEYSPACE IF NOT EXISTS calls WITH replication = {'class' : 'SimpleStrategy', 'replication_factor' : 3};
+    CREATE KEYSPACE IF NOT EXISTS config WITH replication = {'class' : 'SimpleStrategy', 'replication_factor' : 3};
+    CREATE KEYSPACE IF NOT EXISTS dictionary WITH replication = {'class' : 'SimpleStrategy', 'replication_factor' : 3};
\ No newline at end of file
diff --git a/cassandra/templates/statefulset.yaml b/cassandra/templates/statefulset.yaml
index eb45a3d..7b9b7b2 100644
--- a/cassandra/templates/statefulset.yaml
+++ b/cassandra/templates/statefulset.yaml
@@ -177,7 +177,7 @@ spec:
             else
                 echo "Couldn't find the expected Java Key Stores (JKS) files! They are mandatory when encryption via TLS is enabled."
                 exit 1
-            fi
+            fi          
             {{- end }}
           env:
             - name: MY_POD_NAME
diff --git a/cassandra/values.yaml b/cassandra/values.yaml
index fed57e7..cce0227 100644
--- a/cassandra/values.yaml
+++ b/cassandra/values.yaml
@@ -12,12 +12,12 @@
 ## @param global.defaultStorageClass Global default StorageClass for Persistent Volume(s)
 ##
 global:
-  imageRegistry: "registry.co-work.ru"
+  imageRegistry: "docker.ii-p001.local"
   ## E.g.
   ## imagePullSecrets:
   ##   - myRegistryKeySecretName
   ##
-  imagePullSecrets: [docker-registry-secret]
+  imagePullSecrets: []
   defaultStorageClass: ""
   ## Security parameters
   ##
@@ -41,7 +41,7 @@ global:
 nameOverride: ""
 ## @param fullnameOverride String to fully override common.names.fullname
 ##
-fullnameOverride: "cassandra"
+fullnameOverride: ""
 ## @param kubeVersion Force target Kubernetes version (using Helm capabilities if not set)
 ##
 kubeVersion: ""
@@ -138,9 +138,7 @@ dbUser:
   existingSecretPasswordKey: ""
 ## @param initDB Object with cql scripts. Useful for creating a keyspace and pre-populating data
 ##
-
 initDB: {}
-
 ## @param initDBConfigMap ConfigMap with cql scripts. Useful for creating a keyspace and pre-populating data
 ##
 initDBConfigMap: "cassandra-init-script"
@@ -211,7 +209,6 @@ args: []
 extraEnvVars:
   - name: CASSANDRA_CFG_YAML_SASI_INDEXES_ENABLED
     value: "true"
-
 ## @param extraEnvVarsCM Name of existing ConfigMap containing extra env vars
 ##
 extraEnvVarsCM: ""
@@ -286,18 +283,15 @@ affinity:
       - labelSelector:
           matchLabels:
             app.kubernetes.io/name: cassandra
-        topologyKey: "kubernetes.io/hostname"## @param nodeSelector Node labels for pod assignment
+        topologyKey: "kubernetes.io/hostname"
+## @param nodeSelector Node labels for pod assignment
 ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
 ##
-nodeSelector:
-  tenant: client3
+nodeSelector: {}
 ## @param tolerations Tolerations for pod assignment
 ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
 ##
-tolerations:
-- key: "node-role.kubernetes.io/control-plane"
-  operator: "Exists"
-  effect: "NoSchedule"
+tolerations: []
 ## @param topologySpreadConstraints Topology Spread Constraints for pod assignment
 ## https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/
 ## The value is evaluated as a template
@@ -650,7 +644,7 @@ persistence:
   ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
   ##   GKE, AWS & OpenStack)
   ##
-  storageClass: "client3"
+  storageClass: "ceph-rbd-fast-client1"
   ## @param persistence.commitStorageClass PVC Storage Class for Cassandra Commit Log volume
   ## Storage class to use with CASSANDRA_COMMITLOG_DIR to reduce the concurrence for writing data and commit logs
   ## ref: https://github.com/bitnami/containers/tree/main/bitnami/cassandra