diff --git a/charts/coredns/coredns-pod-delete/engine.yaml b/charts/coredns/coredns-pod-delete/engine.yaml
index 2ee22ba..0a1c987 100644
--- a/charts/coredns/coredns-pod-delete/engine.yaml
+++ b/charts/coredns/coredns-pod-delete/engine.yaml
@@ -10,12 +10,11 @@ spec:
     appkind: 'deployment'
   # It can be true/false
   annotationCheck: 'false'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   components:
-    runner:
-       image: 'litmuschaos/chaos-executor:1.0.0'
-       type: 'go'
   chaosServiceAccount: coredns-sa
   monitoring: false
   # It can be delete/retain
diff --git a/charts/coredns/rbac.yaml b/charts/coredns/coredns-pod-delete/rbac.yaml
similarity index 100%
rename from charts/coredns/rbac.yaml
rename to charts/coredns/coredns-pod-delete/rbac.yaml
diff --git a/charts/generic/container-kill/engine.yaml b/charts/generic/container-kill/engine.yaml
index 890c27b..6b37d28 100644
--- a/charts/generic/container-kill/engine.yaml
+++ b/charts/generic/container-kill/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'true'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   appinfo:
@@ -15,16 +17,13 @@ spec:
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete' 
   experiments:
     - name: container-kill
       spec:
         components:
-          # specify the name of the container to be killed
           env:
+            # specify the name of the container to be killed
             - name: TARGET_CONTAINER
               value: 'nginx'
\ No newline at end of file
diff --git a/charts/generic/disk-fill/engine.yaml b/charts/generic/disk-fill/engine.yaml
index 07d70d7..b2c7b15 100644
--- a/charts/generic/disk-fill/engine.yaml
+++ b/charts/generic/disk-fill/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'false'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx  
   auxiliaryAppInfo: ''
   appinfo:
@@ -15,9 +17,6 @@ spec:
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete'
   experiments:
diff --git a/charts/generic/disk-loss/engine.yaml b/charts/generic/disk-loss/engine.yaml
index 70507a8..92f6d94 100644
--- a/charts/generic/disk-loss/engine.yaml
+++ b/charts/generic/disk-loss/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'false'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   appinfo:
@@ -15,9 +17,6 @@ spec:
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be retain/delete
   jobCleanUpPolicy: 'delete'
   experiments:
diff --git a/charts/generic/node-cpu-hog/engine.yaml b/charts/generic/node-cpu-hog/engine.yaml
index 68cc2a2..1566951 100644
--- a/charts/generic/node-cpu-hog/engine.yaml
+++ b/charts/generic/node-cpu-hog/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'false'
+  # It can be active/stop
+  engineState: 'active'
   auxiliaryAppInfo: 'ns1:name=percona,ns2:run=nginx'
   appinfo:
     appns: 'default'
@@ -18,9 +20,6 @@ spec:
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete'
   experiments:
diff --git a/charts/generic/node-drain/engine.yaml b/charts/generic/node-drain/engine.yaml
index c55254a..1200c16 100644
--- a/charts/generic/node-drain/engine.yaml
+++ b/charts/generic/node-drain/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'false'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   appinfo:
@@ -15,9 +17,6 @@ spec:
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete'
   experiments:
diff --git a/charts/generic/pod-cpu-hog/engine.yaml b/charts/generic/pod-cpu-hog/engine.yaml
index 289e73d..7cb16b2 100644
--- a/charts/generic/pod-cpu-hog/engine.yaml
+++ b/charts/generic/pod-cpu-hog/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'true'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   appinfo:
@@ -15,9 +17,6 @@ spec:
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete'
   experiments:
diff --git a/charts/generic/pod-delete/engine.yaml b/charts/generic/pod-delete/engine.yaml
index 4132a0f..ed57912 100644
--- a/charts/generic/pod-delete/engine.yaml
+++ b/charts/generic/pod-delete/engine.yaml
@@ -10,14 +10,13 @@ spec:
     appkind: 'deployment'
   # It can be true/false
   annotationCheck: 'true'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx
   auxiliaryAppInfo: ''
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete'
   experiments:
diff --git a/charts/generic/pod-network-corruption/engine.yaml b/charts/generic/pod-network-corruption/engine.yaml
index a46fc7a..6fd19f5 100644
--- a/charts/generic/pod-network-corruption/engine.yaml
+++ b/charts/generic/pod-network-corruption/engine.yaml
@@ -8,13 +8,12 @@ spec:
   jobCleanUpPolicy: 'delete'
   # It can be true/false
   annotationCheck: 'true'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   appinfo: 
     appns: 'default'
     # FYI, To see app label, apply kubectl get pods --show-labels
diff --git a/charts/generic/pod-network-latency/engine.yaml b/charts/generic/pod-network-latency/engine.yaml
index 17f17dd..2a3506c 100644
--- a/charts/generic/pod-network-latency/engine.yaml
+++ b/charts/generic/pod-network-latency/engine.yaml
@@ -8,13 +8,12 @@ spec:
   jobCleanUpPolicy: 'delete'
   # It can be true/false
   annotationCheck: 'true'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   appinfo: 
     appns: 'default'
     # FYI, To see app label, apply kubectl get pods --show-labels
diff --git a/charts/generic/pod-network-loss/engine.yaml b/charts/generic/pod-network-loss/engine.yaml
index 9478764..1d0057e 100644
--- a/charts/generic/pod-network-loss/engine.yaml
+++ b/charts/generic/pod-network-loss/engine.yaml
@@ -9,13 +9,12 @@ spec:
   jobCleanUpPolicy: 'delete'
   # It can be true/false
   annotationCheck: 'true'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   appinfo: 
     appns: 'default'
     # FYI, To see app label, apply kubectl get pods --show-labels
diff --git a/charts/kafka/kafka-broker-disk-failure/engine.yaml b/charts/kafka/kafka-broker-disk-failure/engine.yaml
index 1d79246..cab74cf 100644
--- a/charts/kafka/kafka-broker-disk-failure/engine.yaml
+++ b/charts/kafka/kafka-broker-disk-failure/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'true'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   appinfo: 
@@ -15,9 +17,6 @@ spec:
   chaosServiceAccount: kafka-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete' 
   experiments:
diff --git a/charts/kafka/kafka-broker-pod-failure/engine.yaml b/charts/kafka/kafka-broker-pod-failure/engine.yaml
index a940ee4..f700a34 100644
--- a/charts/kafka/kafka-broker-pod-failure/engine.yaml
+++ b/charts/kafka/kafka-broker-pod-failure/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'true'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   appinfo: 
@@ -15,9 +17,6 @@ spec:
   chaosServiceAccount: kafka-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete' 
   experiments:
diff --git a/charts/openebs/openebs-pool-container-failure/engine.yaml b/charts/openebs/openebs-pool-container-failure/engine.yaml
index 51d9d2e..e26d7de 100644
--- a/charts/openebs/openebs-pool-container-failure/engine.yaml
+++ b/charts/openebs/openebs-pool-container-failure/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'false'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   appinfo:
@@ -15,9 +17,6 @@ spec:
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete'
   experiments:
diff --git a/charts/openebs/openebs-pool-pod-failure/engine.yaml b/charts/openebs/openebs-pool-pod-failure/engine.yaml
index f04dffe..5af0ea0 100644
--- a/charts/openebs/openebs-pool-pod-failure/engine.yaml
+++ b/charts/openebs/openebs-pool-pod-failure/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'false'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   appinfo:
@@ -15,9 +17,6 @@ spec:
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete'
   experiments:
diff --git a/charts/openebs/openebs-target-container-failure/engine.yaml b/charts/openebs/openebs-target-container-failure/engine.yaml
index 8a1eda5..6e81cce 100644
--- a/charts/openebs/openebs-target-container-failure/engine.yaml
+++ b/charts/openebs/openebs-target-container-failure/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'false' 
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   appinfo:
@@ -15,9 +17,6 @@ spec:
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete'
   experiments:
diff --git a/charts/openebs/openebs-target-network-delay/engine.yaml b/charts/openebs/openebs-target-network-delay/engine.yaml
index 3ae4045..e052f05 100644
--- a/charts/openebs/openebs-target-network-delay/engine.yaml
+++ b/charts/openebs/openebs-target-network-delay/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'false' 
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   appinfo:
@@ -15,9 +17,6 @@ spec:
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete'
   experiments:
diff --git a/charts/openebs/openebs-target-network-loss/engine.yaml b/charts/openebs/openebs-target-network-loss/engine.yaml
index 6560dcb..c513dd5 100644
--- a/charts/openebs/openebs-target-network-loss/engine.yaml
+++ b/charts/openebs/openebs-target-network-loss/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'false'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   appinfo:
@@ -15,9 +17,6 @@ spec:
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete'
   experiments:
diff --git a/charts/openebs/openebs-target-pod-failure/engine.yaml b/charts/openebs/openebs-target-pod-failure/engine.yaml
index 47357a3..9947e44 100644
--- a/charts/openebs/openebs-target-pod-failure/engine.yaml
+++ b/charts/openebs/openebs-target-pod-failure/engine.yaml
@@ -6,6 +6,8 @@ metadata:
 spec:
   # It can be true/false
   annotationCheck: 'false'
+  # It can be active/stop
+  engineState: 'active'
   #ex. values: ns1:name=percona,ns2:run=nginx 
   auxiliaryAppInfo: ''
   appinfo:
@@ -15,9 +17,6 @@ spec:
   chaosServiceAccount: nginx-sa
   monitoring: false
   components:
-    runner:
-      image: 'litmuschaos/chaos-executor:1.0.0'
-      type: 'go'
   # It can be delete/retain
   jobCleanUpPolicy: 'delete'
   experiments: