diff --git a/charts/chaostoolkit/chaostoolkit.chartserviceversion.yaml b/charts/chaostoolkit/chaostoolkit.chartserviceversion.yaml
index e4f1562..c29255c 100644
--- a/charts/chaostoolkit/chaostoolkit.chartserviceversion.yaml
+++ b/charts/chaostoolkit/chaostoolkit.chartserviceversion.yaml
@@ -3,7 +3,7 @@ kind: ChartServiceVersion
 metadata:
   createdAt: 2020-02-24T10:28:08Z
   name: chaostoolkit
-  version: 0.0.5
+  version: 0.0.6
   annotations:
     categories: Kubernetes
     chartDescription: Injects chaostoolkit chaos
diff --git a/charts/chaostoolkit/experiments.yaml b/charts/chaostoolkit/experiments.yaml
index 1ea90b9..19c5048 100644
--- a/charts/chaostoolkit/experiments.yaml
+++ b/charts/chaostoolkit/experiments.yaml
@@ -7,7 +7,7 @@ description:
 kind: ChaosExperiment
 metadata:
   name: k8-pod-delete
-  version: 0.0.3
+  version: 0.0.4
 spec:
   definition:
     scope: Namespaced
diff --git a/charts/chaostoolkit/k8-pod-delete/engine-kiam.yaml b/charts/chaostoolkit/k8-pod-delete/Cluster/engine-kiam-count.yaml
similarity index 96%
rename from charts/chaostoolkit/k8-pod-delete/engine-kiam.yaml
rename to charts/chaostoolkit/k8-pod-delete/Cluster/engine-kiam-count.yaml
index 52793f5..6c6211c 100644
--- a/charts/chaostoolkit/k8-pod-delete/engine-kiam.yaml
+++ b/charts/chaostoolkit/k8-pod-delete/Cluster/engine-kiam-count.yaml
@@ -2,7 +2,7 @@
 apiVersion: litmuschaos.io/v1alpha1
 kind: ChaosEngine
 metadata:
-  name: k8-kiam-delete-count
+  name: k8-kiam-count
   namespace: default
 spec:
   #ex. values: ns1:name=percona,ns2:run=nginx
diff --git a/charts/chaostoolkit/k8-pod-delete/Cluster/engine-kiam-custom-count.yaml b/charts/chaostoolkit/k8-pod-delete/Cluster/engine-kiam-custom-count.yaml
new file mode 100644
index 0000000..c3c4d0f
--- /dev/null
+++ b/charts/chaostoolkit/k8-pod-delete/Cluster/engine-kiam-custom-count.yaml
@@ -0,0 +1,36 @@
+# chaosengine.yaml
+apiVersion: litmuschaos.io/v1alpha1
+kind: ChaosEngine
+metadata:
+  name: k8-kiam-custom-count
+  namespace: default
+spec:
+  #ex. values: ns1:name=percona,ns2:run=nginx
+  appinfo:
+    appns: kube-system
+    # FYI, To see app label, apply kubectl get pods --show-labels
+    #applabel: "app=nginx"
+    applabel: "app=kiam"
+    appkind: deployment
+  jobCleanUpPolicy: retain
+  monitoring: false
+  annotationCheck: 'false'
+  engineState: 'active'
+  chaosServiceAccount: chaos-admin
+  experiments:
+    - name: k8-pod-delete
+      spec:
+        components:
+          env:
+            - name: NAME_SPACE
+              value: kube-system
+            - name: LABEL_NAME
+              value: app=kiam
+            - name: APP_ENDPOINT
+              value: 'localhost'
+            - name: FILE
+              value: 'pod-custom-kill-count.json'
+            - name: REPORT
+              value: 'true'
+            - name: REPORT_ENDPOINT
+              value: 'none'
diff --git a/charts/chaostoolkit/k8-pod-delete/Cluster/engine-kiam-custom-health.yaml b/charts/chaostoolkit/k8-pod-delete/Cluster/engine-kiam-custom-health.yaml
new file mode 100644
index 0000000..446d291
--- /dev/null
+++ b/charts/chaostoolkit/k8-pod-delete/Cluster/engine-kiam-custom-health.yaml
@@ -0,0 +1,36 @@
+# chaosengine.yaml
+apiVersion: litmuschaos.io/v1alpha1
+kind: ChaosEngine
+metadata:
+  name: k8-kiam-custom-health
+  namespace: default
+spec:
+  #ex. values: ns1:name=percona,ns2:run=nginx
+  appinfo:
+    appns: kube-system
+    # FYI, To see app label, apply kubectl get pods --show-labels
+    #applabel: "app=nginx"
+    applabel: "app=kiam"
+    appkind: deployment
+  jobCleanUpPolicy: retain
+  monitoring: false
+  annotationCheck: 'false'
+  engineState: 'active'
+  chaosServiceAccount: chaos-admin
+  experiments:
+    - name: k8-pod-delete
+      spec:
+        components:
+          env:
+            - name: NAME_SPACE
+              value: kube-system
+            - name: LABEL_NAME
+              value: app=kiam
+            - name: APP_ENDPOINT
+              value: 'localhost'
+            - name: FILE
+              value: 'pod-custom-kill-health.json'
+            - name: REPORT
+              value: 'true'
+            - name: REPORT_ENDPOINT
+              value: 'none'
diff --git a/charts/chaostoolkit/k8-pod-delete/Cluster/engine-kiam-health.yaml b/charts/chaostoolkit/k8-pod-delete/Cluster/engine-kiam-health.yaml
new file mode 100644
index 0000000..5cd61c9
--- /dev/null
+++ b/charts/chaostoolkit/k8-pod-delete/Cluster/engine-kiam-health.yaml
@@ -0,0 +1,36 @@
+# chaosengine.yaml
+apiVersion: litmuschaos.io/v1alpha1
+kind: ChaosEngine
+metadata:
+  name: k8-kiam-health
+  namespace: default
+spec:
+  #ex. values: ns1:name=percona,ns2:run=nginx
+  appinfo:
+    appns: kube-system
+    # FYI, To see app label, apply kubectl get pods --show-labels
+    #applabel: "app=nginx"
+    applabel: "app=kiam"
+    appkind: deployment
+  jobCleanUpPolicy: retain
+  monitoring: false
+  annotationCheck: 'false'
+  engineState: 'active'
+  chaosServiceAccount: chaos-admin
+  experiments:
+    - name: k8-pod-delete
+      spec:
+        components:
+          env:
+            - name: NAME_SPACE
+              value: kube-system
+            - name: LABEL_NAME
+              value: kiam
+            - name: APP_ENDPOINT
+              value: 'localhost'
+            - name: FILE
+              value: 'pod-app-kill-health.json'
+            - name: REPORT
+              value: 'true'
+            - name: REPORT_ENDPOINT
+              value: 'none'
diff --git a/charts/chaostoolkit/k8-pod-delete/rbac-admin.yaml b/charts/chaostoolkit/k8-pod-delete/Cluster/rbac-admin.yaml
similarity index 96%
rename from charts/chaostoolkit/k8-pod-delete/rbac-admin.yaml
rename to charts/chaostoolkit/k8-pod-delete/Cluster/rbac-admin.yaml
index c5d22ec..3c61823 100644
--- a/charts/chaostoolkit/k8-pod-delete/rbac-admin.yaml
+++ b/charts/chaostoolkit/k8-pod-delete/Cluster/rbac-admin.yaml
@@ -32,4 +32,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: chaos-admin
-  namespace: msaasfmea4-perf-infra-usw2-ppd-pfi
+  namespace: default
diff --git a/charts/chaostoolkit/k8-pod-delete/Service/engine-app-all-health.yaml b/charts/chaostoolkit/k8-pod-delete/Service/engine-app-all-health.yaml
new file mode 100644
index 0000000..319db08
--- /dev/null
+++ b/charts/chaostoolkit/k8-pod-delete/Service/engine-app-all-health.yaml
@@ -0,0 +1,36 @@
+apiVersion: litmuschaos.io/v1alpha1
+kind: ChaosEngine
+metadata:
+  name: nginx-chaos-app-all-health
+  namespace: default
+spec:
+  appinfo:
+    appns: 'default'
+    applabel: 'app=nginx'
+    appkind: 'deployment'
+  annotationCheck: 'true'
+  engineState: 'active'
+  chaosServiceAccount: k8-pod-delete-sa
+  monitoring: false
+  jobCleanUpPolicy: 'retain'
+  experiments:
+    - name: k8-pod-delete
+      spec:
+        components:
+          env:
+            # set chaos namespace
+            - name: NAME_SPACE
+              value: 'default'
+            # set chaos label name
+            - name: LABEL_NAME
+              value: 'nginx'
+            # pod endpoint
+            - name: APP_ENDPOINT
+              value: 'localhost'
+            - name: FILE
+              value: 'pod-app-kill-all.json'
+            - name: REPORT
+              value: 'true'
+            - name: REPORT_ENDPOINT
+              value: 'none'
+
diff --git a/charts/chaostoolkit/k8-pod-delete/engine.yaml b/charts/chaostoolkit/k8-pod-delete/Service/engine-app-count.yaml
similarity index 96%
rename from charts/chaostoolkit/k8-pod-delete/engine.yaml
rename to charts/chaostoolkit/k8-pod-delete/Service/engine-app-count.yaml
index 916da62..ad04483 100644
--- a/charts/chaostoolkit/k8-pod-delete/engine.yaml
+++ b/charts/chaostoolkit/k8-pod-delete/Service/engine-app-count.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuschaos.io/v1alpha1
 kind: ChaosEngine
 metadata:
-  name: nginx-chaos
+  name: nginx-chaos-app-count
   namespace: default
 spec:
   appinfo:
diff --git a/charts/chaostoolkit/k8-pod-delete/Service/engine-app-health.yaml b/charts/chaostoolkit/k8-pod-delete/Service/engine-app-health.yaml
new file mode 100644
index 0000000..ade527d
--- /dev/null
+++ b/charts/chaostoolkit/k8-pod-delete/Service/engine-app-health.yaml
@@ -0,0 +1,36 @@
+apiVersion: litmuschaos.io/v1alpha1
+kind: ChaosEngine
+metadata:
+  name: nginx-chaos-app-health
+  namespace: default
+spec:
+  appinfo:
+    appns: 'default'
+    applabel: 'app=nginx'
+    appkind: 'deployment'
+  annotationCheck: 'true'
+  engineState: 'active'
+  chaosServiceAccount: k8-pod-delete-sa
+  monitoring: false
+  jobCleanUpPolicy: 'retain'
+  experiments:
+    - name: k8-pod-delete
+      spec:
+        components:
+          env:
+            # set chaos namespace
+            - name: NAME_SPACE
+              value: 'default'
+            # set chaos label name
+            - name: LABEL_NAME
+              value: 'nginx'
+            # pod endpoint
+            - name: APP_ENDPOINT
+              value: 'localhost'
+            - name: FILE
+              value: 'pod-app-kill-health.json'
+            - name: REPORT
+              value: 'true'
+            - name: REPORT_ENDPOINT
+              value: 'none'
+
diff --git a/charts/chaostoolkit/k8-pod-delete/Service/engine-custom-all-health.yaml b/charts/chaostoolkit/k8-pod-delete/Service/engine-custom-all-health.yaml
new file mode 100644
index 0000000..1958a0a
--- /dev/null
+++ b/charts/chaostoolkit/k8-pod-delete/Service/engine-custom-all-health.yaml
@@ -0,0 +1,36 @@
+apiVersion: litmuschaos.io/v1alpha1
+kind: ChaosEngine
+metadata:
+  name: nginx-chaos-custom-all-health
+  namespace: default
+spec:
+  appinfo:
+    appns: 'default'
+    applabel: 'app=nginx'
+    appkind: 'deployment'
+  annotationCheck: 'true'
+  engineState: 'active'
+  chaosServiceAccount: k8-pod-delete-sa
+  monitoring: false
+  jobCleanUpPolicy: 'retain'
+  experiments:
+    - name: k8-pod-delete
+      spec:
+        components:
+          env:
+            # set chaos namespace
+            - name: NAME_SPACE
+              value: 'default'
+            # set chaos label name
+            - name: LABEL_NAME
+              value: 'app=nginx'
+            # pod endpoint
+            - name: APP_ENDPOINT
+              value: 'localhost'
+            - name: FILE
+              value: 'pod-custom-kill-all.json'
+            - name: REPORT
+              value: 'true'
+            - name: REPORT_ENDPOINT
+              value: 'none'
+
diff --git a/charts/chaostoolkit/k8-pod-delete/Service/engine-custom-count.yaml b/charts/chaostoolkit/k8-pod-delete/Service/engine-custom-count.yaml
new file mode 100644
index 0000000..0663303
--- /dev/null
+++ b/charts/chaostoolkit/k8-pod-delete/Service/engine-custom-count.yaml
@@ -0,0 +1,36 @@
+apiVersion: litmuschaos.io/v1alpha1
+kind: ChaosEngine
+metadata:
+  name: nginx-chaos-custom-count
+  namespace: default
+spec:
+  appinfo:
+    appns: 'default'
+    applabel: 'app=nginx'
+    appkind: 'deployment'
+  annotationCheck: 'true'
+  engineState: 'active'
+  chaosServiceAccount: k8-pod-delete-sa
+  monitoring: false
+  jobCleanUpPolicy: 'retain'
+  experiments:
+    - name: k8-pod-delete
+      spec:
+        components:
+          env:
+            # set chaos namespace
+            - name: NAME_SPACE
+              value: 'default'
+            # set chaos label name
+            - name: LABEL_NAME
+              value: 'app=nginx'
+            # pod endpoint
+            - name: APP_ENDPOINT
+              value: 'localhost'
+            - name: FILE
+              value: 'pod-custom-kill-count.json'
+            - name: REPORT
+              value: 'true'
+            - name: REPORT_ENDPOINT
+              value: 'none'
+
diff --git a/charts/chaostoolkit/k8-pod-delete/Service/engine-custom-health.yaml b/charts/chaostoolkit/k8-pod-delete/Service/engine-custom-health.yaml
new file mode 100644
index 0000000..53ed448
--- /dev/null
+++ b/charts/chaostoolkit/k8-pod-delete/Service/engine-custom-health.yaml
@@ -0,0 +1,36 @@
+apiVersion: litmuschaos.io/v1alpha1
+kind: ChaosEngine
+metadata:
+  name: nginx-chaos-custom-health
+  namespace: default
+spec:
+  appinfo:
+    appns: 'default'
+    applabel: 'app=nginx'
+    appkind: 'deployment'
+  annotationCheck: 'true'
+  engineState: 'active'
+  chaosServiceAccount: k8-pod-delete-sa
+  monitoring: false
+  jobCleanUpPolicy: 'retain'
+  experiments:
+    - name: k8-pod-delete
+      spec:
+        components:
+          env:
+            # set chaos namespace
+            - name: NAME_SPACE
+              value: 'default'
+            # set chaos label name
+            - name: LABEL_NAME
+              value: 'app=nginx'
+            # pod endpoint
+            - name: APP_ENDPOINT
+              value: 'localhost'
+            - name: FILE
+              value: 'pod-custom-kill-health.json'
+            - name: REPORT
+              value: 'true'
+            - name: REPORT_ENDPOINT
+              value: 'none'
+
diff --git a/charts/chaostoolkit/k8-pod-delete/rbac.yaml b/charts/chaostoolkit/k8-pod-delete/Service/rbac.yaml
similarity index 100%
rename from charts/chaostoolkit/k8-pod-delete/rbac.yaml
rename to charts/chaostoolkit/k8-pod-delete/Service/rbac.yaml
diff --git a/charts/chaostoolkit/k8-pod-delete/experiment.yaml b/charts/chaostoolkit/k8-pod-delete/experiment.yaml
index f9ac9a6..cc0cc55 100644
--- a/charts/chaostoolkit/k8-pod-delete/experiment.yaml
+++ b/charts/chaostoolkit/k8-pod-delete/experiment.yaml
@@ -30,6 +30,13 @@ spec:
           - "patch"
           - "update"
           - "delete"
+      - apiGroups:
+          - ""
+        resources:
+          - "nodes"
+        verbs :
+          - "get"
+          - "list"
     image: "litmuschaos/chaostoolkit:latest"
     args:
     - -c