diff --git a/assets/cdi/cdi-0.2.0.tgz b/assets/cdi/cdi-0.2.0.tgz
index a946377a..9688cea8 100644
Binary files a/assets/cdi/cdi-0.2.0.tgz and b/assets/cdi/cdi-0.2.0.tgz differ
diff --git a/charts/cdi/0.2.0/templates/NOTES.txt b/charts/cdi/0.2.0/templates/NOTES.txt
index 56eb2cba..9e79f627 100644
--- a/charts/cdi/0.2.0/templates/NOTES.txt
+++ b/charts/cdi/0.2.0/templates/NOTES.txt
@@ -1,2 +1,2 @@
 Verify that all CDI components are installed correctly:
-  kubectl get all -n cdi
+  kubectl get all -n {{ .Release.Namespace }}
diff --git a/charts/cdi/0.2.0/templates/cdi-operator.yaml b/charts/cdi/0.2.0/templates/cdi-operator.yaml
index 5ed271b8..0260230e 100644
--- a/charts/cdi/0.2.0/templates/cdi-operator.yaml
+++ b/charts/cdi/0.2.0/templates/cdi-operator.yaml
@@ -1,10 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    cdi.kubevirt.io: ""
-  name: cdi
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -277,7 +270,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: cdi-operator
-    namespace: cdi
+    namespace: {{ .Release.Namespace }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -285,7 +278,7 @@ metadata:
   labels:
     operator.cdi.kubevirt.io: ""
   name: cdi-operator
-  namespace: cdi
+  namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -295,7 +288,7 @@ metadata:
     app.kubernetes.io/managed-by: cdi-operator
     cdi.kubevirt.io: ""
   name: cdi-operator
-  namespace: cdi
+  namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups:
       - rbac.authorization.k8s.io
@@ -364,7 +357,7 @@ metadata:
     app.kubernetes.io/managed-by: cdi-operator
     cdi.kubevirt.io: ""
   name: cdi-operator
-  namespace: cdi
+  namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -372,7 +365,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: cdi-operator
-    namespace: cdi
+    namespace: {{ .Release.Namespace }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -382,7 +375,7 @@ metadata:
     operator.cdi.kubevirt.io: ""
     prometheus.cdi.kubevirt.io: "true"
   name: cdi-operator
-  namespace: cdi
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
diff --git a/charts/cdi/0.2.0/templates/cdi-cr-uninstall.yaml b/charts/cdi/0.2.0/templates/cdi-uninstall-hooks.yaml
similarity index 93%
rename from charts/cdi/0.2.0/templates/cdi-cr-uninstall.yaml
rename to charts/cdi/0.2.0/templates/cdi-uninstall-hooks.yaml
index b7a87a46..19c0e05e 100644
--- a/charts/cdi/0.2.0/templates/cdi-cr-uninstall.yaml
+++ b/charts/cdi/0.2.0/templates/cdi-uninstall-hooks.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: cdi
+  namespace: {{ .Release.Namespace }}
   name: cdi-cr-uninstaller
   annotations:
     "helm.sh/hook": pre-delete
@@ -33,7 +33,7 @@ metadata:
     "helm.sh/hook-weight": "2"
 subjects:
   - kind: ServiceAccount
-    namespace: cdi
+    namespace: {{ .Release.Namespace }}
     name: cdi-cr-uninstaller
 roleRef:
   kind: ClusterRole
@@ -43,7 +43,7 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: cdi
+  namespace: {{ .Release.Namespace }}
   name: cdi-cr-uninstaller
   annotations:
     "helm.sh/hook": pre-delete
diff --git a/charts/cdi/0.2.0/templates/cdi-cr.yaml b/charts/cdi/0.2.0/templates/cdi.yaml
similarity index 100%
rename from charts/cdi/0.2.0/templates/cdi-cr.yaml
rename to charts/cdi/0.2.0/templates/cdi.yaml
diff --git a/charts/cdi/0.2.0/templates/cdi-crd-uninstall.yaml b/charts/cdi/0.2.0/templates/crd-uninstall-hooks.yaml
similarity index 82%
rename from charts/cdi/0.2.0/templates/cdi-crd-uninstall.yaml
rename to charts/cdi/0.2.0/templates/crd-uninstall-hooks.yaml
index 12814ac6..9150d9eb 100644
--- a/charts/cdi/0.2.0/templates/cdi-crd-uninstall.yaml
+++ b/charts/cdi/0.2.0/templates/crd-uninstall-hooks.yaml
@@ -1,21 +1,12 @@
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: cdi-crd-uninstall
-  annotations:
-    "helm.sh/hook": post-delete
-    "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "1"
----
-apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: cdi-crd-uninstall
+  namespace: {{ .Release.Namespace }}
   name: cdi-crd-uninstaller
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "1"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -24,7 +15,7 @@ metadata:
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "1"
 rules:
   - apiGroups: [ "apiextensions.k8s.io" ]
     resources: [ "customresourcedefinitions" ]
@@ -39,10 +30,10 @@ metadata:
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "3"
+    "helm.sh/hook-weight": "2"
 subjects:
   - kind: ServiceAccount
-    namespace: cdi-crd-uninstall
+    namespace: {{ .Release.Namespace }}
     name: cdi-crd-uninstaller
 roleRef:
   kind: ClusterRole
@@ -52,12 +43,12 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: cdi-crd-uninstall
+  namespace: {{ .Release.Namespace }}
   name: cdi-crd-uninstaller
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "4"
+    "helm.sh/hook-weight": "3"
 spec:
   template:
     metadata:
diff --git a/charts/cdi/0.2.0/templates/cdi-crd-upgrade.yaml b/charts/cdi/0.2.0/templates/crd-upgrade-hooks.yaml
similarity index 85%
rename from charts/cdi/0.2.0/templates/cdi-crd-upgrade.yaml
rename to charts/cdi/0.2.0/templates/crd-upgrade-hooks.yaml
index 98394db1..cfb35312 100644
--- a/charts/cdi/0.2.0/templates/cdi-crd-upgrade.yaml
+++ b/charts/cdi/0.2.0/templates/crd-upgrade-hooks.yaml
@@ -1,21 +1,12 @@
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: cdi-crd-upgrade
-  annotations:
-    "helm.sh/hook": pre-upgrade
-    "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "1"
----
-apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: cdi-crd-upgrade
+  namespace: {{ .Release.Namespace }}
   name: cdi-crd-manifest
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "1"
 data:
   crd: |-
     {{ $.Files.Get "crds/cdi.yaml" | nindent 4 }}
@@ -23,12 +14,12 @@ data:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: cdi-crd-upgrade
+  namespace: {{ .Release.Namespace }}
   name: cdi-crd-upgrader
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "3"
+    "helm.sh/hook-weight": "2"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -37,7 +28,7 @@ metadata:
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "3"
+    "helm.sh/hook-weight": "2"
 rules:
   - apiGroups: [ "" ]
     resources: [ "configmaps" ]
@@ -57,10 +48,10 @@ metadata:
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "4"
+    "helm.sh/hook-weight": "3"
 subjects:
   - kind: ServiceAccount
-    namespace: cdi-crd-upgrade
+    namespace: {{ .Release.Namespace }}
     name: cdi-crd-upgrader
 roleRef:
   kind: ClusterRole
@@ -70,12 +61,12 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: cdi-crd-upgrade
+  namespace: {{ .Release.Namespace }}
   name: cdi-crd-upgrader
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-weight": "4"
 spec:
   template:
     metadata:
diff --git a/index.yaml b/index.yaml
index e94ce460..29f2afa2 100755
--- a/index.yaml
+++ b/index.yaml
@@ -38,9 +38,9 @@ entries:
   cdi:
   - apiVersion: v2
     appVersion: 1.57.0
-    created: "2023-12-06T17:40:36.160396+02:00"
+    created: "2023-12-15T18:50:03.149872+02:00"
     description: A Helm chart for Containerized-Data-Importer (CDI)
-    digest: 90f31de768ef55729dccb75aab892181f9faf522fc15f5bde11186dd622d5aaf
+    digest: 4c49e19f27778126f991f9eab01bdd80e6839272d66af928667d32f21342556b
     icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/kubevirt/icon/color/kubevirt-icon-color.svg
     name: cdi
     type: application
diff --git a/packages/cdi/charts/templates/NOTES.txt b/packages/cdi/charts/templates/NOTES.txt
index 56eb2cba..9e79f627 100644
--- a/packages/cdi/charts/templates/NOTES.txt
+++ b/packages/cdi/charts/templates/NOTES.txt
@@ -1,2 +1,2 @@
 Verify that all CDI components are installed correctly:
-  kubectl get all -n cdi
+  kubectl get all -n {{ .Release.Namespace }}
diff --git a/packages/cdi/charts/templates/cdi-operator.yaml b/packages/cdi/charts/templates/cdi-operator.yaml
index 5ed271b8..0260230e 100644
--- a/packages/cdi/charts/templates/cdi-operator.yaml
+++ b/packages/cdi/charts/templates/cdi-operator.yaml
@@ -1,10 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    cdi.kubevirt.io: ""
-  name: cdi
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -277,7 +270,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: cdi-operator
-    namespace: cdi
+    namespace: {{ .Release.Namespace }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -285,7 +278,7 @@ metadata:
   labels:
     operator.cdi.kubevirt.io: ""
   name: cdi-operator
-  namespace: cdi
+  namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -295,7 +288,7 @@ metadata:
     app.kubernetes.io/managed-by: cdi-operator
     cdi.kubevirt.io: ""
   name: cdi-operator
-  namespace: cdi
+  namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups:
       - rbac.authorization.k8s.io
@@ -364,7 +357,7 @@ metadata:
     app.kubernetes.io/managed-by: cdi-operator
     cdi.kubevirt.io: ""
   name: cdi-operator
-  namespace: cdi
+  namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -372,7 +365,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: cdi-operator
-    namespace: cdi
+    namespace: {{ .Release.Namespace }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -382,7 +375,7 @@ metadata:
     operator.cdi.kubevirt.io: ""
     prometheus.cdi.kubevirt.io: "true"
   name: cdi-operator
-  namespace: cdi
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
diff --git a/packages/cdi/charts/templates/cdi-cr-uninstall.yaml b/packages/cdi/charts/templates/cdi-uninstall-hooks.yaml
similarity index 93%
rename from packages/cdi/charts/templates/cdi-cr-uninstall.yaml
rename to packages/cdi/charts/templates/cdi-uninstall-hooks.yaml
index b7a87a46..19c0e05e 100644
--- a/packages/cdi/charts/templates/cdi-cr-uninstall.yaml
+++ b/packages/cdi/charts/templates/cdi-uninstall-hooks.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: cdi
+  namespace: {{ .Release.Namespace }}
   name: cdi-cr-uninstaller
   annotations:
     "helm.sh/hook": pre-delete
@@ -33,7 +33,7 @@ metadata:
     "helm.sh/hook-weight": "2"
 subjects:
   - kind: ServiceAccount
-    namespace: cdi
+    namespace: {{ .Release.Namespace }}
     name: cdi-cr-uninstaller
 roleRef:
   kind: ClusterRole
@@ -43,7 +43,7 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: cdi
+  namespace: {{ .Release.Namespace }}
   name: cdi-cr-uninstaller
   annotations:
     "helm.sh/hook": pre-delete
diff --git a/packages/cdi/charts/templates/cdi-cr.yaml b/packages/cdi/charts/templates/cdi.yaml
similarity index 100%
rename from packages/cdi/charts/templates/cdi-cr.yaml
rename to packages/cdi/charts/templates/cdi.yaml
diff --git a/packages/cdi/charts/templates/cdi-crd-uninstall.yaml b/packages/cdi/charts/templates/crd-uninstall-hooks.yaml
similarity index 82%
rename from packages/cdi/charts/templates/cdi-crd-uninstall.yaml
rename to packages/cdi/charts/templates/crd-uninstall-hooks.yaml
index 12814ac6..9150d9eb 100644
--- a/packages/cdi/charts/templates/cdi-crd-uninstall.yaml
+++ b/packages/cdi/charts/templates/crd-uninstall-hooks.yaml
@@ -1,21 +1,12 @@
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: cdi-crd-uninstall
-  annotations:
-    "helm.sh/hook": post-delete
-    "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "1"
----
-apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: cdi-crd-uninstall
+  namespace: {{ .Release.Namespace }}
   name: cdi-crd-uninstaller
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "1"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -24,7 +15,7 @@ metadata:
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "1"
 rules:
   - apiGroups: [ "apiextensions.k8s.io" ]
     resources: [ "customresourcedefinitions" ]
@@ -39,10 +30,10 @@ metadata:
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "3"
+    "helm.sh/hook-weight": "2"
 subjects:
   - kind: ServiceAccount
-    namespace: cdi-crd-uninstall
+    namespace: {{ .Release.Namespace }}
     name: cdi-crd-uninstaller
 roleRef:
   kind: ClusterRole
@@ -52,12 +43,12 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: cdi-crd-uninstall
+  namespace: {{ .Release.Namespace }}
   name: cdi-crd-uninstaller
   annotations:
     "helm.sh/hook": post-delete
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "4"
+    "helm.sh/hook-weight": "3"
 spec:
   template:
     metadata:
diff --git a/packages/cdi/charts/templates/cdi-crd-upgrade.yaml b/packages/cdi/charts/templates/crd-upgrade-hooks.yaml
similarity index 85%
rename from packages/cdi/charts/templates/cdi-crd-upgrade.yaml
rename to packages/cdi/charts/templates/crd-upgrade-hooks.yaml
index 98394db1..cfb35312 100644
--- a/packages/cdi/charts/templates/cdi-crd-upgrade.yaml
+++ b/packages/cdi/charts/templates/crd-upgrade-hooks.yaml
@@ -1,21 +1,12 @@
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: cdi-crd-upgrade
-  annotations:
-    "helm.sh/hook": pre-upgrade
-    "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "1"
----
-apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: cdi-crd-upgrade
+  namespace: {{ .Release.Namespace }}
   name: cdi-crd-manifest
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-weight": "1"
 data:
   crd: |-
     {{ $.Files.Get "crds/cdi.yaml" | nindent 4 }}
@@ -23,12 +14,12 @@ data:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: cdi-crd-upgrade
+  namespace: {{ .Release.Namespace }}
   name: cdi-crd-upgrader
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "3"
+    "helm.sh/hook-weight": "2"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -37,7 +28,7 @@ metadata:
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "3"
+    "helm.sh/hook-weight": "2"
 rules:
   - apiGroups: [ "" ]
     resources: [ "configmaps" ]
@@ -57,10 +48,10 @@ metadata:
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "4"
+    "helm.sh/hook-weight": "3"
 subjects:
   - kind: ServiceAccount
-    namespace: cdi-crd-upgrade
+    namespace: {{ .Release.Namespace }}
     name: cdi-crd-upgrader
 roleRef:
   kind: ClusterRole
@@ -70,12 +61,12 @@ roleRef:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  namespace: cdi-crd-upgrade
+  namespace: {{ .Release.Namespace }}
   name: cdi-crd-upgrader
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-weight": "4"
 spec:
   template:
     metadata: