diff --git a/helm/templates/kafka/exercises-realtime-topic.yml b/helm/templates/kafka/exercise-topic.yml
similarity index 89%
rename from helm/templates/kafka/exercises-realtime-topic.yml
rename to helm/templates/kafka/exercise-topic.yml
index 6df4a5e8a..771467e47 100644
--- a/helm/templates/kafka/exercises-realtime-topic.yml
+++ b/helm/templates/kafka/exercise-topic.yml
@@ -1,7 +1,7 @@
 apiVersion: kafka.strimzi.io/v1beta1
 kind: KafkaTopic
 metadata:
-  name: exercises-realtime
+  name: exercise
   namespace: kafka
   labels:
     strimzi.io/cluster: kafka-cluster
diff --git a/kubernetes/kafka-persistent.yml b/kubernetes/kafka-persistent.yml
new file mode 100644
index 000000000..f3e1aeaf2
--- /dev/null
+++ b/kubernetes/kafka-persistent.yml
@@ -0,0 +1,40 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: Kafka
+metadata:
+  name: kafka-cluster
+spec:
+  kafka:
+    version: 3.7.0
+    replicas: 3
+    listeners:
+      - name: plain
+        port: 9092
+        type: internal
+        tls: false
+      - name: tls
+        port: 9093
+        type: internal
+        tls: true
+    config:
+      offsets.topic.replication.factor: 3
+      transaction.state.log.replication.factor: 3
+      transaction.state.log.min.isr: 2
+      default.replication.factor: 3
+      min.insync.replicas: 2
+      inter.broker.protocol.version: "3.7"
+    storage:
+      type: jbod
+      volumes:
+      - id: 0
+        type: persistent-claim
+        size: 10Gi
+        deleteClaim: false
+  zookeeper:
+    replicas: 3
+    storage:
+      type: persistent-claim
+      size: 2Gi
+      deleteClaim: false
+  entityOperator:
+    topicOperator: {}
+    userOperator: {}