diff --git a/Makefile b/Makefile
index 002f51ad18..0fa95f3fab 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,11 @@ forward-port:
 check-release-yaml:
 	./scripts/check-release-yaml
 
-TARGETS := prepare patch clean clean-cache charts list index unzip zip standardize validate template regsync check-images check-rc icon
+lifecycle-assets:
+	@./scripts/pull-scripts
+	@./bin/charts-build-scripts lifecycle-assets --branch-version=$(BRANCH_VERSION) --debugFlag=$(DEBUG) --chart=$(CHART)
+
+TARGETS := prepare patch clean clean-cache charts list index unzip zip standardize validate template regsync check-images check-rc
 
 $(TARGETS):
 	@./scripts/pull-scripts
diff --git a/configuration.yaml b/configuration.yaml
index 00af90f340..9a851976c0 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -3,4 +3,4 @@ helmRepo:
 
 validate:
   url: https://github.com/rancher/charts.git
-  branch: release-v2.9
+  branch: prod-v2.9
diff --git a/docs/makefile.md b/docs/makefile.md
index b656951822..58a6e17ba6 100755
--- a/docs/makefile.md
+++ b/docs/makefile.md
@@ -51,4 +51,6 @@ Please see [`docs/validation.md`](validation.md) for more information on how CI
 
 `make standardize`: Takes an arbitrary Helm repository (defined as any repository with a set of Helm charts under `charts/`) and standardizes it to the expected repository structure of these scripts.
 
-`make clean-cache`: Deletes `.charts-build-scripts/.cache`. Only used if `export USE_CACHE=1` is set, which indicates that you are using the experimental caching feature introduced in v0.3.0 of the scripts. Please see [`docs/experimental.md`](experimental.md) for more information.
\ No newline at end of file
+`make clean-cache`: Deletes `.charts-build-scripts/.cache`. Only used if `export USE_CACHE=1` is set, which indicates that you are using the experimental caching feature introduced in v0.3.0 of the scripts. Please see [`docs/experimental.md`](experimental.md) for more information.
+
+`make lifecycle-assets BRANCH_VERSION=<2.X> DEBUG="<true || false>"`: Lists all assets versions and then starts to remove older versions with `make remove` enforcing the rules defined at: [New Assets Lifecycle](../README.md#new-assets-lifecycle).
\ No newline at end of file
diff --git a/scripts/release-validation/pr-review-template.md b/scripts/release-validation/pr-review-template.md
index c2e1c874fa..81afe6b173 100644
--- a/scripts/release-validation/pr-review-template.md
+++ b/scripts/release-validation/pr-review-template.md
@@ -1,4 +1,4 @@
-## Charts Checklist (built for v0.3.x charts-build-scripts)
+## Charts Checklist (built for v0.7.x charts-build-scripts)
 
 ### Checkpoint 0: Validate `release.yaml`
 
diff --git a/scripts/remove-asset b/scripts/remove-asset
index 1b37b96015..552050a0fc 100755
--- a/scripts/remove-asset
+++ b/scripts/remove-asset
@@ -22,10 +22,13 @@ fi
 
 # Prune empty directories
 set +e
-rmdir charts/${CHART} >/dev/null 2>&1 
-rmdir charts >/dev/null 2>&1 
-rmdir assets/${CHART} >/dev/null 2>&1 
-rmdir assets >/dev/null 2>&1 
+rmdir charts/${CHART} >/dev/null 2>&1
+rmdir charts >/dev/null 2>&1
+rmdir assets/${CHART} >/dev/null 2>&1
+rmdir assets >/dev/null 2>&1
 set -e
 
+touch release.yaml
+yq e -i ".${CHART} = ((.${CHART} + [\"${VERSION}\"]) | unique)" release.yaml
+
 make index
diff --git a/scripts/version b/scripts/version
index b45ec5f4fd..54037be1c3 100755
--- a/scripts/version
+++ b/scripts/version
@@ -2,4 +2,4 @@
 set -e
 
 CHARTS_BUILD_SCRIPTS_REPO=https://github.com/rancher/charts-build-scripts.git
-CHARTS_BUILD_SCRIPT_VERSION="${CHARTS_BUILD_SCRIPT_VERSION:-v0.5.5}"
+CHARTS_BUILD_SCRIPT_VERSION="${CHARTS_BUILD_SCRIPT_VERSION:-v0.7.0}"