diff --git a/Makefile b/Makefile
index d1fbec5e1..5876941a4 100644
--- a/Makefile
+++ b/Makefile
@@ -185,8 +185,7 @@ docker-generate-k8s:
 		-v $(shell go env GOCACHE):/root/.cache/go-build:delegated --env GO111MODULE=on \
 		--env https_proxy=$(https_proxy) --env http_proxy=$(http_proxy) \
 		$(BUILD_IMAGE):$(OPERATOR_SDK_VERSION) /bin/bash -c 'operator-sdk generate k8s'
-	cp deploy/crds/* helm/*/crds/
-	
+
 docker-generate-crds:
 	echo "Generate crds"
 	docker run --rm -v $(PWD):$(WORKDIR) -v $(GOPATH)/pkg/mod:/go/pkg/mod:delegated \
@@ -194,6 +193,8 @@ docker-generate-crds:
 		--env https_proxy=$(https_proxy) --env http_proxy=$(http_proxy) \
 		$(BUILD_IMAGE):$(OPERATOR_SDK_VERSION) /bin/bash -c 'operator-sdk generate crds'
 	@sed -i '/\- protocol/d' deploy/crds/db.orange.com_cassandraclusters_crd.yaml
+	cp -v deploy/crds/* helm/*/crds/
+	cp -v deploy/crds/* */helm/*/crds/
 
 docker-build-operator:
 	echo "Build Cassandra Operator. Using cache from "$(shell go env GOCACHE)
diff --git a/helm/cassandra-operator/crds/db.orange.com_cassandraclusters_crd.yaml b/helm/cassandra-operator/crds/db.orange.com_cassandraclusters_crd.yaml
index 84c0fa2a2..a79f996be 100644
--- a/helm/cassandra-operator/crds/db.orange.com_cassandraclusters_crd.yaml
+++ b/helm/cassandra-operator/crds/db.orange.com_cassandraclusters_crd.yaml
@@ -48,7 +48,6 @@ spec:
                   to load along with each C* pod
                 properties:
                   image:
-                    default: gcr.io/cassandra-operator/instaclustr-icarus:1.0.5
                     description: Image of backup/restore sidecar
                     type: string
                   imagePullPolicy:
diff --git a/helm/cassandra-operator/crds/db.orange.com_cassandrarestores_crd.yaml b/helm/cassandra-operator/crds/db.orange.com_cassandrarestores_crd.yaml
index 0a37b529f..d63968fe9 100644
--- a/helm/cassandra-operator/crds/db.orange.com_cassandrarestores_crd.yaml
+++ b/helm/cassandra-operator/crds/db.orange.com_cassandrarestores_crd.yaml
@@ -67,6 +67,10 @@ spec:
                 description: When set do not delete truncated SSTables after they've
                   been restored during CLEANUP phase. Defaults to false
                 type: boolean
+              rename:
+                additionalProperties:
+                  type: string
+                type: object
               schemaVersion:
                 description: Version of the schema to restore from. Upon backup, a
                   schema version is automatically appended to a snapshot name and
diff --git a/multi-casskop/helm/multi-casskop/crds/db.orange.com_cassandraclusters_crd.yaml b/multi-casskop/helm/multi-casskop/crds/db.orange.com_cassandraclusters_crd.yaml
index 84c0fa2a2..a79f996be 100644
--- a/multi-casskop/helm/multi-casskop/crds/db.orange.com_cassandraclusters_crd.yaml
+++ b/multi-casskop/helm/multi-casskop/crds/db.orange.com_cassandraclusters_crd.yaml
@@ -48,7 +48,6 @@ spec:
                   to load along with each C* pod
                 properties:
                   image:
-                    default: gcr.io/cassandra-operator/instaclustr-icarus:1.0.5
                     description: Image of backup/restore sidecar
                     type: string
                   imagePullPolicy:
diff --git a/multi-casskop/helm/multi-casskop/crds/db.orange.com_cassandrarestores_crd.yaml b/multi-casskop/helm/multi-casskop/crds/db.orange.com_cassandrarestores_crd.yaml
index 0a37b529f..d63968fe9 100644
--- a/multi-casskop/helm/multi-casskop/crds/db.orange.com_cassandrarestores_crd.yaml
+++ b/multi-casskop/helm/multi-casskop/crds/db.orange.com_cassandrarestores_crd.yaml
@@ -67,6 +67,10 @@ spec:
                 description: When set do not delete truncated SSTables after they've
                   been restored during CLEANUP phase. Defaults to false
                 type: boolean
+              rename:
+                additionalProperties:
+                  type: string
+                type: object
               schemaVersion:
                 description: Version of the schema to restore from. Upon backup, a
                   schema version is automatically appended to a snapshot name and
diff --git a/pkg/controller/cassandrarestore/reconcile_test.go b/pkg/controller/cassandrarestore/reconcile_test.go
index a090559d0..002c3a4bf 100644
--- a/pkg/controller/cassandrarestore/reconcile_test.go
+++ b/pkg/controller/cassandrarestore/reconcile_test.go
@@ -34,7 +34,6 @@ spec:
   noDeleteTruncates: false
 #   schemaVersion:
 #   exactSchemaVersion:
-  restorationStrategyType: HARDLINKS
   entities: "k1,k2.t1"
 `
 
diff --git a/test/e2e/kuttl/ScaleUpAndDown/00-createCluster.yaml b/test/e2e/kuttl/ScaleUpAndDown/00-createCluster.yaml
index 189fe2203..1bef86568 100644
--- a/test/e2e/kuttl/ScaleUpAndDown/00-createCluster.yaml
+++ b/test/e2e/kuttl/ScaleUpAndDown/00-createCluster.yaml
@@ -1,8 +1,10 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - command: helm install casskop ../../../../helm/cassandra-operator
-    namespaced: true
+  - script: |
+      BASEDIR=../../../..
+      VERSION=$(awk -F\" '/Version =/ {print $2}' $BASEDIR/version/version.go)-$CIRCLE_BRANCH
+      helm install casskop $BASEDIR/helm/cassandra-operator --set image.tag=$VERSION --namespace $NAMESPACE
 ---
 apiVersion: db.orange.com/v1alpha1
 kind: CassandraCluster
diff --git a/website/docs/2_setup/1_getting_started.md b/website/docs/2_setup/1_getting_started.md
index 6d2e36a00..1af709f70 100644
--- a/website/docs/2_setup/1_getting_started.md
+++ b/website/docs/2_setup/1_getting_started.md
@@ -36,6 +36,10 @@ First we add the repo:
 helm repo add orange-incubator https://orange-kubernetes-charts-incubator.storage.googleapis.com/
 ```
 
+:::tips
+If you already downloaded the helm chart previously, make sure you are using the latest version of the chart by executing a `helm repo update` before continuing.
+:::
+
 Then install the chart using Helm 3:
 
 ```bash