diff --git a/Makefile b/Makefile
index dd2f448..ba8b9e8 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ ARCH ?= amd64
 OS ?= $(shell uname -s | tr A-Z a-z)
 K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
 export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
-TAG ?= main
+TAG ?= v0.4.0
 
 .PHONY: all
 all: build
diff --git a/charts/k8s-cleaner/Chart.yaml b/charts/k8s-cleaner/Chart.yaml
index 91b9019..2380441 100644
--- a/charts/k8s-cleaner/Chart.yaml
+++ b/charts/k8s-cleaner/Chart.yaml
@@ -3,9 +3,9 @@ name: k8s-cleaner
 description: "Cleaner identifies, removes, or updates stale/orphaned or unhealthy resources to maintain a clean and efficient Kubernetes cluster"
 type: application
 # Note: The version is overwritten by the release workflow.
-version: 1.0.0
+version: 1.4.0
 # Note: The version is overwritten by the release workflow.
-appVersion: 1.0.0
+appVersion: 0.4.0
 home: https://github.com/gianlucam76/k8s-cleaner
 icon: https://raw.githubusercontent.com/gianlucam76/k8s-cleaner/main/assets/logo.png
 keywords:
diff --git a/charts/k8s-cleaner/README.md b/charts/k8s-cleaner/README.md
index dbb7ab4..51df852 100644
--- a/charts/k8s-cleaner/README.md
+++ b/charts/k8s-cleaner/README.md
@@ -32,7 +32,7 @@ Major Changes to functions are documented with the version affected. **Before up
 | controller.image.pullPolicy | string | `"IfNotPresent"` | Controller Image pull policy |
 | controller.image.registry | string | `"docker.io"` | Controller Image Registry |
 | controller.image.repository | string | `"projectsveltos/k8s-cleaner"` | Controller Image Repository |
-| controller.image.tag | string | `"main"` | ControllerImage Tag |
+| controller.image.tag | string | `"v0.4.0"` | ControllerImage Tag |
 | controller.livenessProbe | object | `{"enabled":true,"httpGet":{"path":"/healthz","port":8081},"initialDelaySeconds":15,"periodSeconds":20}` | Controller LivenessProbe   |
 | controller.readinessProbe | object | `{"enabled":true,"httpGet":{"path":"/readyz","port":8081},"initialDelaySeconds":5,"periodSeconds":10}` | Controller ReadinessProbe |
 | controller.resources | object | `{"limits":{"cpu":"500m","memory":"128Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}` | Controller Resources   |
diff --git a/charts/k8s-cleaner/crd/apps.projectsveltos.io_cleaners.yaml b/charts/k8s-cleaner/crd/apps.projectsveltos.io_cleaners.yaml
index 27b9b03..f64f205 100644
--- a/charts/k8s-cleaner/crd/apps.projectsveltos.io_cleaners.yaml
+++ b/charts/k8s-cleaner/crd/apps.projectsveltos.io_cleaners.yaml
@@ -119,6 +119,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
               resourcePolicySet:
                 description: ResourcePolicySet identifies a group of resources
                 properties:
diff --git a/charts/k8s-cleaner/values.yaml b/charts/k8s-cleaner/values.yaml
index 882bd86..bedecda 100644
--- a/charts/k8s-cleaner/values.yaml
+++ b/charts/k8s-cleaner/values.yaml
@@ -26,7 +26,7 @@ controller:
     # -- Controller Image Repository
     repository: projectsveltos/k8s-cleaner
     # -- ControllerImage Tag
-    tag: "main"
+    tag: "v0.4.0"
     # -- Controller Image pull policy
     pullPolicy: IfNotPresent
   # -- Controller ARguments
diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml
index 4f416b6..e68b157 100644
--- a/config/default/manager_image_patch.yaml
+++ b/config/default/manager_image_patch.yaml
@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: projectsveltos/k8s-cleaner:main
+      - image: projectsveltos/k8s-cleaner:v0.4.0
         name: controller
diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
index 4f3f097..02c4ecc 100644
--- a/manifest/manifest.yaml
+++ b/manifest/manifest.yaml
@@ -560,7 +560,7 @@ spec:
         - --metrics-bind-address=127.0.0.1:8080
         command:
         - /manager
-        image: projectsveltos/k8s-cleaner:main
+        image: projectsveltos/k8s-cleaner:v0.4.0
         livenessProbe:
           httpGet:
             path: /healthz