diff --git a/kafka-resources/base/kafka-core/kafka-das-topic.yaml b/kafka-resources/base/kafka-core/kafka-das-topic.yaml
index 651bf43..4f42780 100644
--- a/kafka-resources/base/kafka-core/kafka-das-topic.yaml
+++ b/kafka-resources/base/kafka-core/kafka-das-topic.yaml
@@ -11,4 +11,5 @@ spec:
   replicas: 1
   config:
     # http://kafka.apache.org/documentation/#topicconfigs
+    # max.message.bytes: x
     cleanup.policy: compact
diff --git a/kafka-resources/base/kafka-core/kafka-persistent-cluster.yaml b/kafka-resources/base/kafka-core/kafka-persistent-cluster.yaml
index c2d32d7..4157959 100644
--- a/kafka-resources/base/kafka-core/kafka-persistent-cluster.yaml
+++ b/kafka-resources/base/kafka-core/kafka-persistent-cluster.yaml
@@ -33,6 +33,8 @@ spec:
         - broker: 0
           nodePort: 32700
     config:
+      # max.request.size: x
+      # message.max.bytes: ?
       offsets.topic.replication.factor: 1
       transaction.state.log.replication.factor: 1
       transaction.state.log.min.isr: 1
diff --git a/kafka-resources/base/kafka-core/kafka-test-topic-key.yaml b/kafka-resources/base/kafka-core/kafka-test-topic-key.yaml
new file mode 100644
index 0000000..11cf906
--- /dev/null
+++ b/kafka-resources/base/kafka-core/kafka-test-topic-key.yaml
@@ -0,0 +1,13 @@
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: test-topic-key
+  namespace: kafka
+  labels:
+    strimzi.io/cluster: kafka-cluster
+    app.kubernetes.io/part-of: kafka
+spec:
+  partitions: 1
+  replicas: 1
+  config:
+    cleanup.policy: compact
diff --git a/kafka-resources/base/kafka-core/kafka-test-topic.yaml b/kafka-resources/base/kafka-core/kafka-test-topic.yaml
index 5b7b441..a739991 100644
--- a/kafka-resources/base/kafka-core/kafka-test-topic.yaml
+++ b/kafka-resources/base/kafka-core/kafka-test-topic.yaml
@@ -2,6 +2,7 @@ apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaTopic
 metadata:
   name: test-topic
+  namespace: kafka
   labels:
     strimzi.io/cluster: kafka-cluster
     app.kubernetes.io/part-of: kafka
diff --git a/kafka-resources/base/kafka-core/kafka-user.yaml b/kafka-resources/base/kafka-core/kafka-user.yaml
new file mode 100644
index 0000000..fcb1fe3
--- /dev/null
+++ b/kafka-resources/base/kafka-core/kafka-user.yaml
@@ -0,0 +1,33 @@
+apiVersion: kafka.strimzi.io/v1beta1
+kind: KafkaUser
+metadata:
+  namespace: kafka
+  name: kafka-user
+  labels:
+    strimzi.io/cluster: kafka-cluster
+spec:
+  authentication:
+    type: tls
+  authorization:
+    type: simple
+    acls:
+    - resource:
+        type: topic
+        name: "*"
+        patternType: literal
+      operation: All
+    - resource:
+        type: group
+        name: "*"
+        patternType: literal
+      operation: All
+    - resource:
+        type: cluster
+        name: "*"
+        patternType: literal
+      operation: All
+    - resource:
+        type: transactionalId
+        name: "*"
+        patternType: literal
+      operation: All
diff --git a/kafka-resources/base/kafka-core/kustomization.yaml b/kafka-resources/base/kafka-core/kustomization.yaml
index c00c188..d0df8b6 100644
--- a/kafka-resources/base/kafka-core/kustomization.yaml
+++ b/kafka-resources/base/kafka-core/kustomization.yaml
@@ -8,3 +8,4 @@ resources:
 - kafka-persistent-cluster.yaml
 - kafka-das-topic.yaml
 - kafka-test-topic.yaml
+- kafka-test-topic-key.yaml
diff --git a/kafka-resources/base/kafka-schema-registry/kafka-registry-topic.yaml b/kafka-resources/base/kafka-schema-registry/kafka-registry-topic.yaml
index b114b44..e67cff4 100644
--- a/kafka-resources/base/kafka-schema-registry/kafka-registry-topic.yaml
+++ b/kafka-resources/base/kafka-schema-registry/kafka-registry-topic.yaml
@@ -2,6 +2,7 @@ apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaTopic
 metadata:
   name: registry-schemas
+  namespace: kafka
   labels:
     strimzi.io/cluster: kafka-cluster
 spec:
diff --git a/kafka-resources/base/kafka-schema-registry/kafka-user-registry.yaml b/kafka-resources/base/kafka-schema-registry/kafka-user-registry.yaml
index cbdb862..41be5bd 100644
--- a/kafka-resources/base/kafka-schema-registry/kafka-user-registry.yaml
+++ b/kafka-resources/base/kafka-schema-registry/kafka-user-registry.yaml
@@ -1,7 +1,8 @@
 apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaUser
 metadata:
-  name: confluent-schema-registry
+  name: schema-registry-user
+  namespace: kafka
   labels:
     strimzi.io/cluster: kafka-cluster
 spec:
diff --git a/kafka-resources/base/kafka-schema-registry/kustomization.yaml b/kafka-resources/base/kafka-schema-registry/kustomization.yaml
index c2712b0..965a96c 100644
--- a/kafka-resources/base/kafka-schema-registry/kustomization.yaml
+++ b/kafka-resources/base/kafka-schema-registry/kustomization.yaml
@@ -2,8 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 namespace: kafka
+commonLabels:
+  app.kubernetes.io/name: schema-topic-registry
 resources:
 - schema-registry-deployment.yaml
 - schema-registry-service.yaml
 - kafka-registry-topic.yaml
-# - kafka-user-registry.yaml
+- kafka-user-registry.yaml
diff --git a/kafka-resources/overlays/dev/kafka-core/kafka-persistent-cluster.yaml b/kafka-resources/overlays/dev/kafka-core/kafka-persistent-cluster.yaml
index e5b4ec1..f31c611 100644
--- a/kafka-resources/overlays/dev/kafka-core/kafka-persistent-cluster.yaml
+++ b/kafka-resources/overlays/dev/kafka-core/kafka-persistent-cluster.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: kafka
 spec:
   kafka:
-    replicas: 2
+    replicas: 1
     config:
       offsets.topic.replication.factor: 1
       transaction.state.log.replication.factor: 1
@@ -28,4 +28,3 @@ spec:
       size: 10Gi
       deleteClaim: false
       class: csi-sc-cinderplugin
-
diff --git a/kafka-resources/overlays/dev/kafka-schema-registry/kustomization.yaml b/kafka-resources/overlays/dev/kafka-schema-registry/kustomization.yaml
new file mode 100644
index 0000000..8d8115d
--- /dev/null
+++ b/kafka-resources/overlays/dev/kafka-schema-registry/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: kafka
+resources:
+- ../../../base/kafka-schema-registry/
+patchesStrategicMerge:
+- schema-registry-deployment.yaml
diff --git a/kafka-resources/overlays/dev/kafka-schema-registry/schema-registry-deployment.yaml b/kafka-resources/overlays/dev/kafka-schema-registry/schema-registry-deployment.yaml
new file mode 100644
index 0000000..f6a470c
--- /dev/null
+++ b/kafka-resources/overlays/dev/kafka-schema-registry/schema-registry-deployment.yaml
@@ -0,0 +1,9 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: schema-registry
+  name: schema-registry
+  namespace: kafka
+spec:
+  replicas: 1
diff --git a/kafka-resources/overlays/dev/kustomization.yaml b/kafka-resources/overlays/dev/kustomization.yaml
index 387cb82..32d0cfa 100644
--- a/kafka-resources/overlays/dev/kustomization.yaml
+++ b/kafka-resources/overlays/dev/kustomization.yaml
@@ -5,4 +5,5 @@ namespace: kafka
 commonLabels:
   env: dev
 resources:
-  - kafka-core/
+- kafka-core/
+- kafka-schema-registry/
diff --git a/kafka-resources/overlays/prod/kafka-core/kafka-persistent-cluster.yaml b/kafka-resources/overlays/prod/kafka-core/kafka-persistent-cluster.yaml
index 51f6568..8e65821 100644
--- a/kafka-resources/overlays/prod/kafka-core/kafka-persistent-cluster.yaml
+++ b/kafka-resources/overlays/prod/kafka-core/kafka-persistent-cluster.yaml
@@ -22,10 +22,9 @@ spec:
         deleteClaim: false
         class: csi-sc-cinderplugin
   zookeeper:
-    replicas: 3
+    replicas: 5
     storage:
       type: persistent-claim
       size: 112Gi
       deleteClaim: false
       class: csi-sc-cinderplugin
-
diff --git a/kafka-resources/overlays/prod/kafka-schema-registry/kustomization.yaml b/kafka-resources/overlays/prod/kafka-schema-registry/kustomization.yaml
new file mode 100644
index 0000000..8d8115d
--- /dev/null
+++ b/kafka-resources/overlays/prod/kafka-schema-registry/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: kafka
+resources:
+- ../../../base/kafka-schema-registry/
+patchesStrategicMerge:
+- schema-registry-deployment.yaml
diff --git a/kafka-resources/overlays/prod/kafka-schema-registry/schema-registry-deployment.yaml b/kafka-resources/overlays/prod/kafka-schema-registry/schema-registry-deployment.yaml
new file mode 100644
index 0000000..d2d812b
--- /dev/null
+++ b/kafka-resources/overlays/prod/kafka-schema-registry/schema-registry-deployment.yaml
@@ -0,0 +1,9 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: schema-registry
+  name: schema-registry
+  namespace: kafka
+spec:
+  replicas: 5
diff --git a/kafka-resources/overlays/prod/kustomization.yaml b/kafka-resources/overlays/prod/kustomization.yaml
index 69a7658..4e707de 100644
--- a/kafka-resources/overlays/prod/kustomization.yaml
+++ b/kafka-resources/overlays/prod/kustomization.yaml
@@ -5,4 +5,5 @@ namespace: kafka
 commonLabels:
   env: prod
 resources:
-  - kafka-core/
+- kafka-core/
+- kafka-schema-registry/
diff --git a/kafka-resources/overlays/test/kafka-core/kafka-persistent-cluster.yaml b/kafka-resources/overlays/test/kafka-core/kafka-persistent-cluster.yaml
index d07a906..83acd44 100644
--- a/kafka-resources/overlays/test/kafka-core/kafka-persistent-cluster.yaml
+++ b/kafka-resources/overlays/test/kafka-core/kafka-persistent-cluster.yaml
@@ -22,10 +22,9 @@ spec:
         deleteClaim: false
         class: csi-sc-cinderplugin
   zookeeper:
-    replicas: 2
+    replicas: 3
     storage:
       type: persistent-claim
       size: 20Gi
       deleteClaim: false
       class: csi-sc-cinderplugin
-
diff --git a/kafka-resources/overlays/test/kafka-schema-registry/kustomization.yaml b/kafka-resources/overlays/test/kafka-schema-registry/kustomization.yaml
new file mode 100644
index 0000000..8d8115d
--- /dev/null
+++ b/kafka-resources/overlays/test/kafka-schema-registry/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: kafka
+resources:
+- ../../../base/kafka-schema-registry/
+patchesStrategicMerge:
+- schema-registry-deployment.yaml
diff --git a/kafka-resources/overlays/test/kafka-schema-registry/schema-registry-deployment.yaml b/kafka-resources/overlays/test/kafka-schema-registry/schema-registry-deployment.yaml
new file mode 100644
index 0000000..aeeaee1
--- /dev/null
+++ b/kafka-resources/overlays/test/kafka-schema-registry/schema-registry-deployment.yaml
@@ -0,0 +1,9 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: schema-registry
+  name: schema-registry
+  namespace: kafka
+spec:
+  replicas: 3
diff --git a/kafka-resources/overlays/test/kustomization.yaml b/kafka-resources/overlays/test/kustomization.yaml
index 003c60d..a7a4565 100644
--- a/kafka-resources/overlays/test/kustomization.yaml
+++ b/kafka-resources/overlays/test/kustomization.yaml
@@ -5,4 +5,5 @@ namespace: kafka
 commonLabels:
   env: test
 resources:
-  - kafka-core/
+- kafka-core/
+- kafka-schema-registry/