diff --git a/configure/aks-storageclass-broker-managed.yml b/configure/aks-storageclass-broker-managed.yml
index 1c9b3c65..50ae160b 100644
--- a/configure/aks-storageclass-broker-managed.yml
+++ b/configure/aks-storageclass-broker-managed.yml
@@ -6,4 +6,4 @@ provisioner: kubernetes.io/azure-disk
 reclaimPolicy: Retain
 parameters:
   kind: "Managed"
-  storageaccounttype: Premium_LRS
\ No newline at end of file
+  storageaccounttype: Premium_LRS
diff --git a/configure/aks-storageclass-zookeeper-managed.yml b/configure/aks-storageclass-zookeeper-managed.yml
index 6963dcca..2c4e0ff1 100644
--- a/configure/aks-storageclass-zookeeper-managed.yml
+++ b/configure/aks-storageclass-zookeeper-managed.yml
@@ -6,4 +6,4 @@ provisioner: kubernetes.io/azure-disk
 reclaimPolicy: Retain
 parameters:
   kind: "Managed"
-  storageaccounttype: Premium_LRS
\ No newline at end of file
+  storageaccounttype: Premium_LRS
diff --git a/configure/aws-storageclass-broker-gp2.yml b/configure/aws-storageclass-broker-gp2.yml
index 94996b54..16289b51 100644
--- a/configure/aws-storageclass-broker-gp2.yml
+++ b/configure/aws-storageclass-broker-gp2.yml
@@ -6,5 +6,6 @@ metadata:
     k8s-addon: storage-aws.addons.k8s.io
 provisioner: kubernetes.io/aws-ebs
 reclaimPolicy: Retain
+allowVolumeExpansion: true
 parameters:
   type: gp2
diff --git a/configure/aws-storageclass-zookeeper-gp2.yml b/configure/aws-storageclass-zookeeper-gp2.yml
index 806e455e..1e651df1 100644
--- a/configure/aws-storageclass-zookeeper-gp2.yml
+++ b/configure/aws-storageclass-zookeeper-gp2.yml
@@ -6,5 +6,6 @@ metadata:
     k8s-addon: storage-aws.addons.k8s.io
 provisioner: kubernetes.io/aws-ebs
 reclaimPolicy: Retain
+allowVolumeExpansion: true
 parameters:
   type: gp2
diff --git a/configure/gke-regional-euwest1cd-zookeeper-ssd.yml b/configure/gke-regional-euwest1cd-zookeeper-ssd.yml
new file mode 100644
index 00000000..22d9602f
--- /dev/null
+++ b/configure/gke-regional-euwest1cd-zookeeper-ssd.yml
@@ -0,0 +1,11 @@
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: kafka-zookeeper-regional
+provisioner: kubernetes.io/gce-pd
+reclaimPolicy: Retain
+allowVolumeExpansion: true
+parameters:
+  type: pd-ssd
+  replication-type: regional-pd
+  zones: europe-west1-c, europe-west1-d
diff --git a/configure/gke-storageclass-broker-pd.yml b/configure/gke-storageclass-broker-pd.yml
index dbb7203f..25c7ed5b 100644
--- a/configure/gke-storageclass-broker-pd.yml
+++ b/configure/gke-storageclass-broker-pd.yml
@@ -4,5 +4,6 @@ metadata:
   name: kafka-broker
 provisioner: kubernetes.io/gce-pd
 reclaimPolicy: Retain
+allowVolumeExpansion: true
 parameters:
   type: pd-standard
diff --git a/configure/gke-storageclass-zookeeper-ssd.yml b/configure/gke-storageclass-zookeeper-ssd.yml
index 5d6673a1..2223d7b2 100644
--- a/configure/gke-storageclass-zookeeper-ssd.yml
+++ b/configure/gke-storageclass-zookeeper-ssd.yml
@@ -4,5 +4,6 @@ metadata:
   name: kafka-zookeeper
 provisioner: kubernetes.io/gce-pd
 reclaimPolicy: Retain
+allowVolumeExpansion: true
 parameters:
   type: pd-ssd
diff --git a/configure/minikube-storageclass-broker.yml b/configure/minikube-storageclass-broker.yml
deleted file mode 100644
index ae930b4d..00000000
--- a/configure/minikube-storageclass-broker.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  name: kafka-broker
-provisioner: k8s.io/minikube-hostpath
-reclaimPolicy: Retain
diff --git a/configure/minikube-storageclass-zookeeper.yml b/configure/minikube-storageclass-zookeeper.yml
deleted file mode 100644
index 48c0f35b..00000000
--- a/configure/minikube-storageclass-zookeeper.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  name: kafka-zookeeper
-provisioner: k8s.io/minikube-hostpath
-reclaimPolicy: Retain
diff --git a/configure/minikube-storageclasses.yml b/configure/minikube-storageclasses.yml
new file mode 100644
index 00000000..045699f1
--- /dev/null
+++ b/configure/minikube-storageclasses.yml
@@ -0,0 +1,21 @@
+---
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: kafka-broker
+provisioner: k8s.io/minikube-hostpath
+reclaimPolicy: Retain
+---
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: kafka-zookeeper
+provisioner: k8s.io/minikube-hostpath
+reclaimPolicy: Retain
+---
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: kafka-zookeeper-regional
+provisioner: k8s.io/minikube-hostpath
+reclaimPolicy: Retain
diff --git a/kafka/50kafka.yml b/kafka/50kafka.yml
index c1271424..36cf64dc 100644
--- a/kafka/50kafka.yml
+++ b/kafka/50kafka.yml
@@ -95,4 +95,4 @@ spec:
       storageClassName: kafka-broker
       resources:
         requests:
-          storage: 200Gi
+          storage: 10Gi
diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml
index a63afd5f..b8d323c7 100644
--- a/zookeeper/51zoo.yml
+++ b/zookeeper/51zoo.yml
@@ -7,7 +7,7 @@ spec:
   selector:
     matchLabels:
       app: zookeeper
-      storage: ephemeral
+      storage: persistent-regional
   serviceName: "zoo"
   replicas: 2
   updateStrategy:
@@ -17,7 +17,7 @@ spec:
     metadata:
       labels:
         app: zookeeper
-        storage: ephemeral
+        storage: persistent-regional
       annotations:
     spec:
       terminationGracePeriodSeconds: 10
@@ -78,5 +78,12 @@ spec:
           name: zookeeper-config
       - name: config
         emptyDir: {}
-      - name: data
-        emptyDir: {}
+  volumeClaimTemplates:
+  - metadata:
+      name: data
+    spec:
+      accessModes: [ "ReadWriteOnce" ]
+      storageClassName: kafka-zookeeper-regional
+      resources:
+        requests:
+          storage: 1Gi