diff --git a/charts/generic/container_kill/container_kill.chartserviceversion.basetemplate.yaml b/charts/generic/container_kill/container_kill.chartserviceversion.basetemplate.yaml
index 61da200..583327a 100644
--- a/charts/generic/container_kill/container_kill.chartserviceversion.basetemplate.yaml
+++ b/charts/generic/container_kill/container_kill.chartserviceversion.basetemplate.yaml
@@ -34,4 +34,4 @@ spec:
   experiments:
     - container-kill-exp.yaml
     - pod-delete-exp.yaml
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/community-charts/master/charts/kubernetes/state/experiments/k8s_state_all_exp_crd.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/container_kill/experiment.yaml
diff --git a/charts/generic/container_kill/container_kill.chartserviceversion.yaml b/charts/generic/container_kill/container_kill.chartserviceversion.yaml
index cecde65..8c35020 100644
--- a/charts/generic/container_kill/container_kill.chartserviceversion.yaml
+++ b/charts/generic/container_kill/container_kill.chartserviceversion.yaml
@@ -34,4 +34,4 @@ spec:
   experiments:
     - container-kill-exp.yaml
     - pod-delete-exp.yaml
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/community-charts/master/charts/kubernetes/state/experiments/k8s_state_all_exp_crd.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/container_kill/experiment.yaml
diff --git a/charts/generic/pod_delete/pod_delete.chartserviceversion.basetemplate.yaml b/charts/generic/pod_delete/pod_delete.chartserviceversion.basetemplate.yaml
index d20f8ab..17f3d6e 100644
--- a/charts/generic/pod_delete/pod_delete.chartserviceversion.basetemplate.yaml
+++ b/charts/generic/pod_delete/pod_delete.chartserviceversion.basetemplate.yaml
@@ -34,4 +34,4 @@ spec:
   experiments:
     - container-kill-exp.yaml
     - pod-delete-exp.yaml
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/community-charts/master/charts/kubernetes/state/experiments/k8s_state_all_exp_crd.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/pod_delete/experiment.yaml
diff --git a/charts/generic/pod_delete/pod_delete.chartserviceversion.yaml b/charts/generic/pod_delete/pod_delete.chartserviceversion.yaml
index c3a7ce4..1807c68 100644
--- a/charts/generic/pod_delete/pod_delete.chartserviceversion.yaml
+++ b/charts/generic/pod_delete/pod_delete.chartserviceversion.yaml
@@ -34,4 +34,4 @@ spec:
   experiments:
     - container-kill-exp.yaml
     - pod-delete-exp.yaml
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/community-charts/master/charts/kubernetes/state/experiments/k8s_state_all_exp_crd.yaml
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/pod_delete/experiment.yaml
diff --git a/charts/generic/pod_network_delay/pod_network_delay.chartserviceversion.basetemplate.yaml b/charts/generic/pod_network_delay/pod_network_delay.chartserviceversion.basetemplate.yaml
index d392460..db62ee4 100644
--- a/charts/generic/pod_network_delay/pod_network_delay.chartserviceversion.basetemplate.yaml
+++ b/charts/generic/pod_network_delay/pod_network_delay.chartserviceversion.basetemplate.yaml
@@ -31,4 +31,4 @@ spec:
   icon:
     - base64data: ""
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/community-charts/master/charts/kubernetes/network/experiments/k8s_nw_all_exp_crd.yaml 
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/pod_network_delay/experiment.yaml 
diff --git a/charts/generic/pod_network_delay/pod_network_delay.chartserviceversion.yaml b/charts/generic/pod_network_delay/pod_network_delay.chartserviceversion.yaml
index e51b1e8..cb796d6 100644
--- a/charts/generic/pod_network_delay/pod_network_delay.chartserviceversion.yaml
+++ b/charts/generic/pod_network_delay/pod_network_delay.chartserviceversion.yaml
@@ -31,4 +31,4 @@ spec:
   icon:
     - base64data: ""
       mediatype: ""
-  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/community-charts/master/charts/kubernetes/network/experiments/k8s_nw_all_exp_crd.yaml 
+  chaosexpcrdlink: https://raw.githubusercontent.com/litmuschaos/chaos-charts/master/charts/generic/pod_network_delay/experiment.yaml