diff --git a/tob-upgrade/elastic/elastic.yaml b/tob-upgrade/elastic/elastic.yaml
index 5e8a3cd..4f37867 100644
--- a/tob-upgrade/elastic/elastic.yaml
+++ b/tob-upgrade/elastic/elastic.yaml
@@ -39,7 +39,7 @@ spec:
     path: /data/elastic-training/es_data
   claimRef:
     kind: PersistentVolumeClaim
-    namespace: 
+    namespace: training
     name: elastic-training-elastic-1
   nodeAffinity:
     required:
diff --git a/tob-upgrade/kafka/kafka.yaml b/tob-upgrade/kafka/kafka.yaml
index bbc57b5..010e0c6 100644
--- a/tob-upgrade/kafka/kafka.yaml
+++ b/tob-upgrade/kafka/kafka.yaml
@@ -25,7 +25,7 @@ spec:
   dataVolumeCapacity: 10Gi
   logVolumeCapacity: 10Gi
   storageClass:
-    name: training-kafka
+    name: kafka-training
 ---
 apiVersion: platform.confluent.io/v1beta1
 kind: Kafka
@@ -62,7 +62,7 @@ spec:
     init: confluentinc/confluent-init-container:2.6.0
   dataVolumeCapacity: 20Gi
   storageClass:
-    name: training-kafka
+    name: kafka-training
   metricReporter:
     enabled: true
   listeners:
diff --git a/tob-upgrade/kafka/storage.yaml b/tob-upgrade/kafka/storage.yaml
index ae6a8e4..8cf5e6f 100644
--- a/tob-upgrade/kafka/storage.yaml
+++ b/tob-upgrade/kafka/storage.yaml
@@ -2,7 +2,7 @@
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
-  name: training-kafka
+  name: kafka-training
 provisioner: openebs.io/local
 reclaimPolicy: Retain
 allowVolumeExpansion: true