diff --git a/examples/demo/image_pull_policy/nginx.yaml b/examples/demo/1_image_pull_policy/nginx.yaml
similarity index 100%
rename from examples/demo/image_pull_policy/nginx.yaml
rename to examples/demo/1_image_pull_policy/nginx.yaml
diff --git a/examples/demo/image_pull_policy/policy.yaml b/examples/demo/1_image_pull_policy/policy.yaml
similarity index 75%
rename from examples/demo/image_pull_policy/policy.yaml
rename to examples/demo/1_image_pull_policy/policy.yaml
index 51297741de..6da37a961e 100644
--- a/examples/demo/image_pull_policy/policy.yaml
+++ b/examples/demo/1_image_pull_policy/policy.yaml
@@ -8,6 +8,12 @@ spec:
     resource:
       kinds:
       - Deployment
+      # - StatefulSet
+      # name: "my-deployment"
+      # selector :
+      #   matchLabels:
+      #     app.type: prod
+      # namespace: "my-namespace"
     mutate:
       overlay:
         spec:
diff --git a/examples/demo/allowed_registry/nginx.yaml b/examples/demo/2_allowed_registry/nginx.yaml
similarity index 100%
rename from examples/demo/allowed_registry/nginx.yaml
rename to examples/demo/2_allowed_registry/nginx.yaml
diff --git a/examples/demo/allowed_registry/policy.yaml b/examples/demo/2_allowed_registry/policy.yaml
similarity index 79%
rename from examples/demo/allowed_registry/policy.yaml
rename to examples/demo/2_allowed_registry/policy.yaml
index 0b97272c41..4964e434d9 100644
--- a/examples/demo/allowed_registry/policy.yaml
+++ b/examples/demo/2_allowed_registry/policy.yaml
@@ -9,6 +9,7 @@ spec:
       kinds:
       - Deployment
       - StatefulSet
+      namespace: default
     validate:
       message: "Registry is not allowed"
       pattern:
@@ -18,5 +19,4 @@ spec:
               containers:
               - name: "*"
                 # Check allowed registries
-                image: "*nirmata*"
-                # image: "*nirmata* | https://private.registry.io/*"
+                image: "*nirmata* | https://private.registry.io/*"
diff --git a/examples/demo/network_policy/namespace.yaml b/examples/demo/3_network_policy/namespace.yaml
similarity index 100%
rename from examples/demo/network_policy/namespace.yaml
rename to examples/demo/3_network_policy/namespace.yaml
diff --git a/examples/demo/network_policy/policy.yaml b/examples/demo/3_network_policy/policy.yaml
similarity index 70%
rename from examples/demo/network_policy/policy.yaml
rename to examples/demo/3_network_policy/policy.yaml
index ed2465c7fd..c68090abf6 100644
--- a/examples/demo/network_policy/policy.yaml
+++ b/examples/demo/3_network_policy/policy.yaml
@@ -8,7 +8,7 @@ spec:
     resource: 
       kinds:
        - Namespace
-      name: "*"
+      name: "devtest"
     generate: 
       kind: NetworkPolicy
       name: deny-ingress-traffic
@@ -22,4 +22,9 @@ spec:
         metadata:
           annotations: {}
           labels:
-            policyname: "default"
\ No newline at end of file
+            policyname: "default"
+      # kind: ConfigMap
+      # name: default-config
+      # clone:
+      #   namespace: default
+      #   name: config-template
\ No newline at end of file
diff --git a/examples/demo/non_root/nginx.yaml b/examples/demo/4_non_root/nginx.yaml
similarity index 100%
rename from examples/demo/non_root/nginx.yaml
rename to examples/demo/4_non_root/nginx.yaml
diff --git a/examples/demo/non_root/policy.yaml b/examples/demo/4_non_root/policy.yaml
similarity index 100%
rename from examples/demo/non_root/policy.yaml
rename to examples/demo/4_non_root/policy.yaml
diff --git a/examples/demo/health_check/pod.yaml b/examples/demo/5_health_check/pod.yaml
similarity index 95%
rename from examples/demo/health_check/pod.yaml
rename to examples/demo/5_health_check/pod.yaml
index d9a912c99c..f5f0004d3a 100644
--- a/examples/demo/health_check/pod.yaml
+++ b/examples/demo/5_health_check/pod.yaml
@@ -13,7 +13,7 @@ spec:
     - -c
     - touch /tmp/healthy; sleep 30; rm -rf /tmp/healthy; sleep 600
     readinessProbe:
-      periodSeconds: 5
+      # successThreshold: 3
       exec:
         command:
         - cat
diff --git a/examples/demo/health_check/policy.yaml b/examples/demo/5_health_check/policy.yaml
similarity index 82%
rename from examples/demo/health_check/policy.yaml
rename to examples/demo/5_health_check/policy.yaml
index eda5a4bfd2..0550b16fe6 100644
--- a/examples/demo/health_check/policy.yaml
+++ b/examples/demo/5_health_check/policy.yaml
@@ -9,19 +9,19 @@ spec:
       kinds :
       - Pod
     validate:
-      message: "a readinessProbe is required"
+      message: "readinessProbe is required"
       pattern:
         spec:
           containers:
           - (name): "readiness"
             readinessProbe:
-              periodSeconds: ">0"
+              successThreshold: ">1"
   - name: check-livenessProbe-exists
     resource:
       kinds :
       - Pod
     validate:
-      message: "a livenessProbe is required"
+      message: "livenessProbe is required"
       pattern:
         spec:
           containers:
diff --git a/examples/demo/qos/policy_qos.yaml b/examples/demo/6_qos/policy_qos.yaml
similarity index 92%
rename from examples/demo/qos/policy_qos.yaml
rename to examples/demo/6_qos/policy_qos.yaml
index 49aabe72bd..d7598499ab 100644
--- a/examples/demo/qos/policy_qos.yaml
+++ b/examples/demo/6_qos/policy_qos.yaml
@@ -4,22 +4,6 @@ metadata:
   name: policy-qos
 spec:
   rules:
-  - name: add-memory-limit
-    resource:
-      kinds:
-      - Deployment
-    mutate:
-      overlay:
-        spec:
-          template:
-            spec:
-              containers:
-                # the wildcard * will match all containers in the list
-                - (name): "*"
-                  resources:
-                    limits:
-                      # add memory limit if it is not exist
-                      "+(memory)": "300Mi"
   - name: check-cpu-memory-limits
     resource:
       kinds:
@@ -37,4 +21,20 @@ spec:
                   limits:
                     # cpu and memory are required
                     memory: "?*"
-                    cpu: "?*"
\ No newline at end of file
+                    cpu: "?*"
+  - name: add-memory-limit
+    resource:
+      kinds:
+      - Deployment
+    mutate:
+      overlay:
+        spec:
+          template:
+            spec:
+              containers:
+                # the wildcard * will match all containers in the list
+                - (name): "*"
+                  resources:
+                    limits:
+                      # add memory limit if it is not exist
+                      "+(memory)": "300Mi"
\ No newline at end of file
diff --git a/examples/demo/qos/qos.yaml b/examples/demo/6_qos/qos.yaml
similarity index 100%
rename from examples/demo/qos/qos.yaml
rename to examples/demo/6_qos/qos.yaml
diff --git a/examples/demo/container_security_context/nginx.yaml b/examples/demo/7_container_security_context/nginx.yaml
similarity index 100%
rename from examples/demo/container_security_context/nginx.yaml
rename to examples/demo/7_container_security_context/nginx.yaml
diff --git a/examples/demo/container_security_context/policy.yaml b/examples/demo/7_container_security_context/policy.yaml
similarity index 100%
rename from examples/demo/container_security_context/policy.yaml
rename to examples/demo/7_container_security_context/policy.yaml