diff --git a/charts/kubernetes/kubernetes.chartserviceversion.v0.1.0.yaml b/charts/kubernetes/kubernetes.chartserviceversion.basetemplate.yaml
similarity index 96%
rename from charts/kubernetes/kubernetes.chartserviceversion.v0.1.0.yaml
rename to charts/kubernetes/kubernetes.chartserviceversion.basetemplate.yaml
index 6d6db8d..9fd4367 100644
--- a/charts/kubernetes/kubernetes.chartserviceversion.v0.1.0.yaml
+++ b/charts/kubernetes/kubernetes.chartserviceversion.basetemplate.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: kubernetes-v0.1.0
+  name: kubernetes
   annotations:
     categories: "Kubernetes"
     vendor: "CNCF"
@@ -24,7 +24,7 @@ spec:
   keywords:
     - Kubernetes
     - ContainerOrchestrators
-  version: v0.1.0 
+  version: {{ VERSION }}
   maturity: alpha
   maintainers:
     - name: ksatchit
diff --git a/charts/kubernetes/kubernetes.chartserviceversion.yaml b/charts/kubernetes/kubernetes.chartserviceversion.yaml
index 9fd4367..6d6db8d 100644
--- a/charts/kubernetes/kubernetes.chartserviceversion.yaml
+++ b/charts/kubernetes/kubernetes.chartserviceversion.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: kubernetes
+  name: kubernetes-v0.1.0
   annotations:
     categories: "Kubernetes"
     vendor: "CNCF"
@@ -24,7 +24,7 @@ spec:
   keywords:
     - Kubernetes
     - ContainerOrchestrators
-  version: {{ VERSION }}
+  version: v0.1.0 
   maturity: alpha
   maintainers:
     - name: ksatchit
diff --git a/charts/kubernetes/network/experiments/pod-nw-delay.yaml b/charts/kubernetes/network/experiments/pod-nw-delay-exp.basetemplate.yaml
similarity index 100%
rename from charts/kubernetes/network/experiments/pod-nw-delay.yaml
rename to charts/kubernetes/network/experiments/pod-nw-delay-exp.basetemplate.yaml
diff --git a/charts/kubernetes/network/experiments/pod-nw-delay.v0.1.0.yaml b/charts/kubernetes/network/experiments/pod-nw-delay-exp.version.yaml
similarity index 100%
rename from charts/kubernetes/network/experiments/pod-nw-delay.v0.1.0.yaml
rename to charts/kubernetes/network/experiments/pod-nw-delay-exp.version.yaml
diff --git a/charts/kubernetes/network/network.chartserviceversion.v0.1.0.yaml b/charts/kubernetes/network/network.chartserviceversion.basetemplate.yaml
similarity index 95%
rename from charts/kubernetes/network/network.chartserviceversion.v0.1.0.yaml
rename to charts/kubernetes/network/network.chartserviceversion.basetemplate.yaml
index 44ccc38..5579c32 100644
--- a/charts/kubernetes/network/network.chartserviceversion.v0.1.0.yaml
+++ b/charts/kubernetes/network/network.chartserviceversion.basetemplate.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: kubernetes-network-v0.1.0 
+  name: kubernetes-network 
   annotations:
     categories: "Kubernetes"
     vendor: "CNCF"
@@ -16,7 +16,7 @@ spec:
   keywords:
     - Kubernetes
     - Network
-  version: v0.1.0
+  version: {{ VERSION }}
   maturity: alpha
   maintainers:
     - name: ksatchit
diff --git a/charts/kubernetes/network/network.chartserviceversion.yaml b/charts/kubernetes/network/network.chartserviceversion.yaml
index 5579c32..44ccc38 100644
--- a/charts/kubernetes/network/network.chartserviceversion.yaml
+++ b/charts/kubernetes/network/network.chartserviceversion.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: kubernetes-network 
+  name: kubernetes-network-v0.1.0 
   annotations:
     categories: "Kubernetes"
     vendor: "CNCF"
@@ -16,7 +16,7 @@ spec:
   keywords:
     - Kubernetes
     - Network
-  version: {{ VERSION }}
+  version: v0.1.0
   maturity: alpha
   maintainers:
     - name: ksatchit
diff --git a/charts/kubernetes/state/experiments/container-kill-exp.yaml b/charts/kubernetes/state/experiments/container-kill-exp.basetemplate.yaml
similarity index 100%
rename from charts/kubernetes/state/experiments/container-kill-exp.yaml
rename to charts/kubernetes/state/experiments/container-kill-exp.basetemplate.yaml
diff --git a/charts/kubernetes/state/experiments/container-kill-exp.v0.1.0.yaml b/charts/kubernetes/state/experiments/container-kill-exp.version.yaml
similarity index 100%
rename from charts/kubernetes/state/experiments/container-kill-exp.v0.1.0.yaml
rename to charts/kubernetes/state/experiments/container-kill-exp.version.yaml
diff --git a/charts/kubernetes/state/experiments/pod-delete-exp.yaml b/charts/kubernetes/state/experiments/pod-delete-exp.basetemplate.yaml
similarity index 100%
rename from charts/kubernetes/state/experiments/pod-delete-exp.yaml
rename to charts/kubernetes/state/experiments/pod-delete-exp.basetemplate.yaml
diff --git a/charts/kubernetes/state/experiments/pod-delete-exp.v0.1.0.yaml b/charts/kubernetes/state/experiments/pod-delete-exp.version.yaml
similarity index 100%
rename from charts/kubernetes/state/experiments/pod-delete-exp.v0.1.0.yaml
rename to charts/kubernetes/state/experiments/pod-delete-exp.version.yaml
diff --git a/charts/kubernetes/state/state.chartserviceversion.v0.1.0.yaml b/charts/kubernetes/state/state.chartserviceversion.basetemplate.yaml
similarity index 96%
rename from charts/kubernetes/state/state.chartserviceversion.v0.1.0.yaml
rename to charts/kubernetes/state/state.chartserviceversion.basetemplate.yaml
index 0a7c59b..2429d05 100644
--- a/charts/kubernetes/state/state.chartserviceversion.v0.1.0.yaml
+++ b/charts/kubernetes/state/state.chartserviceversion.basetemplate.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: kubernetes-state-v0.1.0 
+  name: kubernetes-state 
   annotations:
     categories: "Kubernetes"
     vendor: "CNCF"
@@ -17,7 +17,7 @@ spec:
   keywords:
     - Kubernetes
     - State 
-  version: v0.1.0
+  version: {{ VERSION }}
   maturity: alpha
   maintainers:
     - name: ksatchit
diff --git a/charts/kubernetes/state/state.chartserviceversion.yaml b/charts/kubernetes/state/state.chartserviceversion.yaml
index 2429d05..0a7c59b 100644
--- a/charts/kubernetes/state/state.chartserviceversion.yaml
+++ b/charts/kubernetes/state/state.chartserviceversion.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: kubernetes-state 
+  name: kubernetes-state-v0.1.0 
   annotations:
     categories: "Kubernetes"
     vendor: "CNCF"
@@ -17,7 +17,7 @@ spec:
   keywords:
     - Kubernetes
     - State 
-  version: {{ VERSION }}
+  version: v0.1.0
   maturity: alpha
   maintainers:
     - name: ksatchit
diff --git a/charts/openebs/network/network.chartserviceversion.v0.1.0.yaml b/charts/openebs/network/network.chartserviceversion.basetemplate.yaml
similarity index 95%
rename from charts/openebs/network/network.chartserviceversion.v0.1.0.yaml
rename to charts/openebs/network/network.chartserviceversion.basetemplate.yaml
index c10fd5f..ce36e2e 100644
--- a/charts/openebs/network/network.chartserviceversion.v0.1.0.yaml
+++ b/charts/openebs/network/network.chartserviceversion.basetemplate.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: kubernetes-network-v0.1.0 
+  name: openebs-network 
   annotations:
     categories: "OpenEBS"
     vendor: "CNCF"
@@ -16,7 +16,7 @@ spec:
     - Kubernetes
     - Network
     - OpenEBS
-  version: v0.1.0
+  version: {{ VERSION }}
   maturity: alpha
   maintainers:
     - name: ksatchit
diff --git a/charts/openebs/network/network.chartserviceversion.yaml b/charts/openebs/network/network.chartserviceversion.yaml
index ce36e2e..c10fd5f 100644
--- a/charts/openebs/network/network.chartserviceversion.yaml
+++ b/charts/openebs/network/network.chartserviceversion.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: openebs-network 
+  name: kubernetes-network-v0.1.0 
   annotations:
     categories: "OpenEBS"
     vendor: "CNCF"
@@ -16,7 +16,7 @@ spec:
     - Kubernetes
     - Network
     - OpenEBS
-  version: {{ VERSION }}
+  version: v0.1.0
   maturity: alpha
   maintainers:
     - name: ksatchit
diff --git a/charts/openebs/openebs.chartserviceversion.v0.1.0.yaml b/charts/openebs/openebs.chartserviceversion.basetemplate.yaml
similarity index 96%
rename from charts/openebs/openebs.chartserviceversion.v0.1.0.yaml
rename to charts/openebs/openebs.chartserviceversion.basetemplate.yaml
index 5254d90..2c02087 100644
--- a/charts/openebs/openebs.chartserviceversion.v0.1.0.yaml
+++ b/charts/openebs/openebs.chartserviceversion.basetemplate.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: openebs-v0.1.0
+  name: openebs
   annotations:
     categories: "OpenEBS"
     vendor: "MayaData"
@@ -22,7 +22,7 @@ spec:
     - OpenEBS
     - CAS
     - Storage
-  version: v0.1.0 
+  version: {{ VERSION }}
   maturity: alpha
   maintainers:
     - name: ksatchit
diff --git a/charts/openebs/openebs.chartserviceversion.yaml b/charts/openebs/openebs.chartserviceversion.yaml
index 2c02087..5254d90 100644
--- a/charts/openebs/openebs.chartserviceversion.yaml
+++ b/charts/openebs/openebs.chartserviceversion.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: openebs
+  name: openebs-v0.1.0
   annotations:
     categories: "OpenEBS"
     vendor: "MayaData"
@@ -22,7 +22,7 @@ spec:
     - OpenEBS
     - CAS
     - Storage
-  version: {{ VERSION }}
+  version: v0.1.0 
   maturity: alpha
   maintainers:
     - name: ksatchit
diff --git a/charts/openebs/state/experiments/pod-delete-exp.yaml b/charts/openebs/state/experiments/pod-delete-exp.basetemplate.yaml
similarity index 100%
rename from charts/openebs/state/experiments/pod-delete-exp.yaml
rename to charts/openebs/state/experiments/pod-delete-exp.basetemplate.yaml
diff --git a/charts/openebs/state/experiments/pod-delete-exp.v0.1.0.yaml b/charts/openebs/state/experiments/pod-delete-exp.version.yaml
similarity index 100%
rename from charts/openebs/state/experiments/pod-delete-exp.v0.1.0.yaml
rename to charts/openebs/state/experiments/pod-delete-exp.version.yaml
diff --git a/charts/openebs/state/state.chartserviceversion.v0.1.0.yaml b/charts/openebs/state/state.chartserviceversion.basetemplate.yaml
similarity index 96%
rename from charts/openebs/state/state.chartserviceversion.v0.1.0.yaml
rename to charts/openebs/state/state.chartserviceversion.basetemplate.yaml
index dcdfd2c..c10d22d 100644
--- a/charts/openebs/state/state.chartserviceversion.v0.1.0.yaml
+++ b/charts/openebs/state/state.chartserviceversion.basetemplate.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: openebs-state-v0.1.0 
+  name: openebss-state 
   annotations:
     categories: "OpenEBS"
     vendor: "CNCF"
@@ -18,7 +18,7 @@ spec:
     - Kubernetes
     - State 
     - OpenEBS
-  version: v0.1.0
+  version: {{ VERSION }}
   maturity: alpha
   maintainers:
     - name: ksatchit
diff --git a/charts/openebs/state/state.chartserviceversion.yaml b/charts/openebs/state/state.chartserviceversion.yaml
index c10d22d..dcdfd2c 100644
--- a/charts/openebs/state/state.chartserviceversion.yaml
+++ b/charts/openebs/state/state.chartserviceversion.yaml
@@ -1,7 +1,7 @@
 apiVersion: litmuchaos.io/v1alpha1
 kind: ChartServiceVersion
 metadata:
-  name: openebss-state 
+  name: openebs-state-v0.1.0 
   annotations:
     categories: "OpenEBS"
     vendor: "CNCF"
@@ -18,7 +18,7 @@ spec:
     - Kubernetes
     - State 
     - OpenEBS
-  version: {{ VERSION }}
+  version: v0.1.0
   maturity: alpha
   maintainers:
     - name: ksatchit