diff --git a/cassandra/Chart.yaml b/cassandra/Chart.yaml
index 5013008..ca48e94 100644
--- a/cassandra/Chart.yaml
+++ b/cassandra/Chart.yaml
@@ -18,7 +18,7 @@ dependencies:
   version: 2.x.x
 description: Apache Cassandra is an open source distributed database management system
   designed to handle large amounts of data across many servers, providing high availability
-  with no single point of failure.
+  with no single point of failure. And lets test it. Now.
 home: https://bitnami.com
 icon: https://dyltqmyl993wv.cloudfront.net/assets/stacks/cassandra/img/cassandra-stack-220x234.png
 keywords:
diff --git a/cassandra/templates/vault-setup.yaml b/cassandra/templates/vault-setup.yaml
new file mode 100644
index 0000000..0a93dd1
--- /dev/null
+++ b/cassandra/templates/vault-setup.yaml
@@ -0,0 +1,43 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: vault-secrets-operator-controller-manager
+---
+apiVersion: secrets.hashicorp.com/v1beta1
+kind: VaultConnection
+metadata:
+  name: vault-connection
+  namespace: {{ .Release.Namespace }}
+spec:
+  address: http://vault.vault.svc.cluster.local:8200
+  skipTLSVerify: true
+---
+apiVersion: secrets.hashicorp.com/v1beta1
+kind: VaultAuth
+metadata:
+  name: vault-auth
+  namespace: {{ .Release.Namespace }}
+spec:
+  method: kubernetes
+  mount: kubernetes
+  kubernetes:
+    role: cassandra-role
+    serviceAccount: vault-secrets-operator-controller-manager
+    audiences:
+      - vault
+---
+apiVersion: secrets.hashicorp.com/v1beta1
+kind: VaultStaticSecret
+metadata:
+  name: cassandra-static-user-passwords
+  namespace: {{ .Release.Namespace }}
+spec:
+  mount: kvv2
+  type: kv-v2
+  path: cassandra/config
+  refreshAfter: 5m
+  destination:
+    create: true
+    name: cassandra-static-user-passwords
+  vaultAuthRef: vault-auth
diff --git a/cassandra/values.yaml b/cassandra/values.yaml
index 0d4c31a..e64e922 100644
--- a/cassandra/values.yaml
+++ b/cassandra/values.yaml
@@ -134,7 +134,7 @@ dbUser:
   ##   keyMapping:
   ##     cassandra-password: myCassandraPasswordKey
   ##
-  existingSecret: ""
+  existingSecret: "cassandra-static-user-passwords"
   existingSecretPasswordKey: ""
 ## @param initDB Object with cql scripts. Useful for creating a keyspace and pre-populating data
 ##
@@ -275,14 +275,7 @@ nodeAffinityPreset:
 ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
 ## NOTE: podAffinityPreset, podAntiAffinityPreset, and nodeAffinityPreset will be ignored when it's set
 ##
-affinity:
-  podAntiAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      - labelSelector:
-          matchLabels:
-            app.kubernetes.io/name: cassandra
-        topologyKey: "kubernetes.io/hostname"## @param nodeSelector Node labels for pod assignment
-
+affinity: {}
 ## @param nodeSelector Node labels for pod assignment
 ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
 ##