diff --git a/10pvc.yml b/10pvc.yml
index 51de19c1..1fb60e7e 100644
--- a/10pvc.yml
+++ b/10pvc.yml
@@ -4,45 +4,40 @@ apiVersion: v1
 metadata:
   name: datadir-kafka-0
   namespace: kafka
+  annotations:
+    volume.beta.kubernetes.io/storage-class: gp2 
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: 200Gi
-  selector:
-    matchLabels:
-      app: kafka
-      podindex: "0"
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: datadir-kafka-1
   namespace: kafka
+  annotations:
+    volume.beta.kubernetes.io/storage-class: gp2 
+
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: 200Gi
-  selector:
-    matchLabels:
-      app: kafka
-      podindex: "1"
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: datadir-kafka-2
   namespace: kafka
+  annotations:
+    volume.beta.kubernetes.io/storage-class: gp2 
 spec:
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: 200Gi
-  selector:
-    matchLabels:
-      app: kafka
-      podindex: "2"
diff --git a/40storageclass.yaml b/40storageclass.yaml
new file mode 100644
index 00000000..31bd5572
--- /dev/null
+++ b/40storageclass.yaml
@@ -0,0 +1,9 @@
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: gp2
+  namespace: kafka
+provisioner: kubernetes.io/aws-ebs
+parameters:
+  type: gp2 
+  zone: us-east-1a
diff --git a/50kafka.yml b/50kafka.yml
index 8a262dff..5133b318 100644
--- a/50kafka.yml
+++ b/50kafka.yml
@@ -27,6 +27,8 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: datadir
+      annotations:
+        volume.beta.kubernetes.io/storage-class: gp2 
     spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
diff --git a/zookeeper/50zoo.yml b/zookeeper/50zoo.yml
index 5cb7c024..c1609649 100644
--- a/zookeeper/50zoo.yml
+++ b/zookeeper/50zoo.yml
@@ -5,7 +5,7 @@ metadata:
   namespace: kafka
 spec:
   serviceName: "zoo"
-  replicas: 5
+  replicas: 3
   template:
     metadata:
       labels: