diff --git a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-addheaders_test.yaml b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-addheaders_test.yaml
index e831d50..25ae089 100644
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-addheaders_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-addheaders_test.yaml
@@ -21,7 +21,7 @@ tests:
           of: ConfigMap
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-custom-add-headers
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-custom-add-headers
       - equal:
           path: data.X-Another-Custom-Header
           value: Value
diff --git a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-proxyheaders_test.yaml b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-proxyheaders_test.yaml
index 0634a37..e920c48 100644
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-proxyheaders_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap-proxyheaders_test.yaml
@@ -21,7 +21,7 @@ tests:
           of: ConfigMap
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-custom-proxy-headers
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-custom-proxy-headers
       - equal:
           path: data.X-Custom-Header
           value: Value
diff --git a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap_test.yaml b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap_test.yaml
index 0387603..c60ee5b 100644
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-configmap_test.yaml
@@ -11,4 +11,4 @@ tests:
           of: ConfigMap
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
diff --git a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-daemonset_test.yaml b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-daemonset_test.yaml
index 2e85848..54f74ae 100644
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-daemonset_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-daemonset_test.yaml
@@ -6,6 +6,7 @@ tests:
   - it: should create a DaemonSet if `controller.kind` is "DaemonSet"
     set:
       controller.kind: DaemonSet
+      kind: Vanilla
     asserts:
       - hasDocuments:
           count: 1
@@ -13,4 +14,4 @@ tests:
           of: DaemonSet
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
diff --git a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-deployment_test.yaml b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-deployment_test.yaml
index 0184461..6b4d5ee 100644
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-deployment_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-deployment_test.yaml
@@ -4,6 +4,8 @@ templates:
 
 tests:
   - it: should create a Deployment
+    set:
+      kind: Vanilla
     asserts:
       - hasDocuments:
           count: 1
@@ -11,11 +13,12 @@ tests:
           of: Deployment
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
 
   - it: should create a Deployment with 3 replicas if `controller.replicaCount` is 3
     set:
       controller.replicaCount: 3
+      kind: Vanilla
     asserts:
       - equal:
           path: spec.replicas
@@ -25,6 +28,7 @@ tests:
     set:
       controller.resources.limits.cpu: 500m
       controller.resources.limits.memory: 512Mi
+      kind: Vanilla
     asserts:
       - equal:
           path: spec.template.spec.containers[0].resources.limits.cpu
diff --git a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-hpa_test.yaml b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-hpa_test.yaml
index 7cd6685..08364e0 100644
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-hpa_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-hpa_test.yaml
@@ -14,4 +14,4 @@ tests:
           of: HorizontalPodAutoscaler
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
diff --git a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-keda_test.yaml b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-keda_test.yaml
index e6ca8db..9cf6ad2 100644
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-keda_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-keda_test.yaml
@@ -14,4 +14,4 @@ tests:
           of: ScaledObject
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
diff --git a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-networkpolicy_test.yaml b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-networkpolicy_test.yaml
index 5de12e9..6ecacee 100644
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-networkpolicy_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-networkpolicy_test.yaml
@@ -20,4 +20,4 @@ tests:
           of: NetworkPolicy
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
diff --git a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-internal_test.yaml b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-internal_test.yaml
index 5465e1a..a5be7e7 100644
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-internal_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-internal_test.yaml
@@ -22,4 +22,4 @@ tests:
           of: Service
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller-internal
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller-internal
diff --git a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-metrics_test.yaml b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-metrics_test.yaml
index afdb940..3ab07dd 100644
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-metrics_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service-metrics_test.yaml
@@ -20,4 +20,4 @@ tests:
           of: Service
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller-metrics
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller-metrics
diff --git a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service_test.yaml b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service_test.yaml
index 10574f2..2d3aac6 100644
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/controller-service_test.yaml
@@ -20,7 +20,7 @@ tests:
           of: Service
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-controller
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-controller
 
   - it: should create a Service of type "NodePort" if `controller.service.external.enabled` is true and `controller.service.type` is "NodePort"
     set:
diff --git a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/default-backend-service_test.yaml b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/default-backend-service_test.yaml
index f16904f..3ece8ee 100644
--- a/build_system/charts/open-appsec-k8s-nginx-ingress/tests/default-backend-service_test.yaml
+++ b/build_system/charts/open-appsec-k8s-nginx-ingress/tests/default-backend-service_test.yaml
@@ -20,7 +20,7 @@ tests:
           of: Service
       - equal:
           path: metadata.name
-          value: RELEASE-NAME-ingress-nginx-defaultbackend
+          value: RELEASE-NAME-open-appsec-k8s-nginx-ingress-defaultbackend
 
   - it: should create a Service with port 80 if `defaultBackend.service.port` is 80
     set: