diff --git a/charts/generic/disk-loss/engine.yaml b/charts/generic/disk-loss/engine.yaml
index f3faf6f..3fe90ab 100644
--- a/charts/generic/disk-loss/engine.yaml
+++ b/charts/generic/disk-loss/engine.yaml
@@ -29,7 +29,7 @@ spec:
 
             # set cloud platform name
             - name: CLOUD_PLATFORM
-              value: 'GCP'
+              value: 'GKE'
 
             # set app_check to check application state
             - name: APP_CHECK
diff --git a/charts/generic/disk-loss/experiment.yaml b/charts/generic/disk-loss/experiment.yaml
index b3f8260..fdab7ad 100644
--- a/charts/generic/disk-loss/experiment.yaml
+++ b/charts/generic/disk-loss/experiment.yaml
@@ -53,9 +53,9 @@ spec:
     - name: CHAOS_NAMESPACE
       value: ''
         
-    # It supports GCP and AWS
+    # GKE and AWS supported
     - name: CLOUD_PLATFORM
-      value: 'GCP'
+      value: 'GKE'
 
     - name: PROJECT_ID 
       value: ''
diff --git a/charts/kafka/kafka-broker-disk-failure/experiment.yaml b/charts/kafka/kafka-broker-disk-failure/experiment.yaml
index df596c8..7e550b5 100644
--- a/charts/kafka/kafka-broker-disk-failure/experiment.yaml
+++ b/charts/kafka/kafka-broker-disk-failure/experiment.yaml
@@ -66,8 +66,9 @@ spec:
     - name: ZONE_NAME
       value: '' 
 
+    # GKE and AWS supported
     - name: CLOUD_PLATFORM
-      value: 'GCP'
+      value: 'GKE'
 
     - name: KAFKA_NAMESPACE
       value: ''
diff --git a/charts/kafka/kafka-broker-pod-failure/engine.yaml b/charts/kafka/kafka-broker-pod-failure/engine.yaml
index 8f88bab..2895ca8 100644
--- a/charts/kafka/kafka-broker-pod-failure/engine.yaml
+++ b/charts/kafka/kafka-broker-pod-failure/engine.yaml
@@ -42,9 +42,9 @@ spec:
             - name: KAFKA_PORT
               value: '9092'
 
-            # in milliseconds  
+            # Recommended timeout for EKS platform: 60000 ms
             - name: KAFKA_CONSUMER_TIMEOUT
-              value: '70000'
+              value: '30000' # in milliseconds  
 
             # ensure to set the instance name if using KUDO operator
             - name: KAFKA_INSTANCE_NAME
diff --git a/charts/kafka/kafka-broker-pod-failure/experiment.yaml b/charts/kafka/kafka-broker-pod-failure/experiment.yaml
index ceba770..302ae87 100644
--- a/charts/kafka/kafka-broker-pod-failure/experiment.yaml
+++ b/charts/kafka/kafka-broker-pod-failure/experiment.yaml
@@ -60,8 +60,13 @@ spec:
     - name: KAFKA_LIVENESS_IMAGE
       value: 'litmuschaos/kafka-client:ci'
 
+    # set to 'enabled' if you have auth set up
+    - name: KAFKA_SASL_AUTH
+      value: 'disabled'
+
+    # Recommended timeout for EKS platform: 60000 ms
     - name: KAFKA_CONSUMER_TIMEOUT
-      value: '30000'
+      value: '30000' #in ms
 
     - name: TOTAL_CHAOS_DURATION
       value: '15'
diff --git a/charts/kafka/kafka-broker-pod-failure/kafka-broker-pod-failure.chartserviceversion.yaml b/charts/kafka/kafka-broker-pod-failure/kafka-broker-pod-failure.chartserviceversion.yaml
index 1e12722..094a2b3 100644
--- a/charts/kafka/kafka-broker-pod-failure/kafka-broker-pod-failure.chartserviceversion.yaml
+++ b/charts/kafka/kafka-broker-pod-failure/kafka-broker-pod-failure.chartserviceversion.yaml
@@ -20,6 +20,7 @@ spec:
     - Kafka
   platforms:
     - GKE
+    - EKS
     - konvoy
   maturity: alpha
   maintainers:
diff --git a/charts/openebs/openebs-pool-disk-loss/engine.yaml b/charts/openebs/openebs-pool-disk-loss/engine.yaml
index 9273941..691439a 100644
--- a/charts/openebs/openebs-pool-disk-loss/engine.yaml
+++ b/charts/openebs/openebs-pool-disk-loss/engine.yaml
@@ -30,9 +30,9 @@ spec:
             - name: CHAOS_NAMESPACE
               value: ''
 
-            # Only GCP and AWS is supported
+            # GKE and AWS supported
             - name: CLOUD_PLATFORM
-              value: 'GCP'
+              value: 'GKE'
 
             # Enter the time duration in sec after the disk is dettached
             - name: TOTAL_CHAOS_DURATION
diff --git a/charts/openebs/openebs-pool-disk-loss/experiment.yaml b/charts/openebs/openebs-pool-disk-loss/experiment.yaml
index c836c0e..0c2cbfa 100644
--- a/charts/openebs/openebs-pool-disk-loss/experiment.yaml
+++ b/charts/openebs/openebs-pool-disk-loss/experiment.yaml
@@ -64,9 +64,9 @@ spec:
       - name: CHAOS_NAMESPACE
         value: ''
 
-      # It supports GCP and AWS
+       # GKE and AWS supported
       - name: CLOUD_PLATFORM
-        value: 'GCP'
+        value: 'GKE'
 
       - name: PROJECT_ID 
         value: ''