diff --git a/Jenkinsfile b/Jenkinsfile
index 00a8373399d4d960f072d6bbff35d299c29e3020..8020f96671328714bfb5d6c57ceedf40accca013 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -206,7 +206,7 @@ Void testAndDeployElasticsearchHelmChart(String helmChartVersion){
 
 Void runHelmTests(){
     sh 'helm lint -f ../../test/helm/linter_values.yaml'
-    sh "helm unittest --helm3 -f '../../test/helm/*.yaml' -f '../../test/helm/*/*.yaml' ."
+    sh "helm unittest -f '../../test/helm/*/*.yaml' ."
     sh "helm package --version=${HELM_CHART_VERSION} ."
 }
 
diff --git a/ozgcloud-elasticsearch-operator/run_helm_test.sh b/ozgcloud-elasticsearch-operator/run_helm_test.sh
index 8097a39a04ff100d5c9350e205d942100dd37894..e02dfa80a5c6d9a4e98cb6b5bff4e3b3e46df817 100755
--- a/ozgcloud-elasticsearch-operator/run_helm_test.sh
+++ b/ozgcloud-elasticsearch-operator/run_helm_test.sh
@@ -4,4 +4,4 @@ set -e
 
 helm template  ./src/main/helm/ -f src/test/helm/linter_values.yaml
 helm lint -f src/test/helm/linter_values.yaml ./src/main/helm/
-cd src/main/helm && helm unittest --helm3 -f '../../test/helm/*/*.yaml' -f '../../test/helm/*.yaml' .
+cd src/main/helm && helm unittest  -f '../../test/helm/*/*.yaml' .
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_edit_role_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_edit_role_test.yaml
index 078cf0a0cf2fd7498271d63ca3fb6e686b85e71a..6bc79960ebe16d221cbc2fd8ba9d842e47c280cd 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_edit_role_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_edit_role_test.yaml
@@ -22,17 +22,17 @@ tests:
   - it: should have metadata labels name
     asserts: 
       - equal:
-          path: metadata.labels.[app.kubernetes.io/name]
+          path: metadata.labels["app.kubernetes.io/name"]
           value: release-name
   - it: should have metadata labels instance
     asserts: 
       - equal:
-          path: metadata.labels.[app.kubernetes.io/instance]
+          path: metadata.labels["app.kubernetes.io/instance"]
           value: release-name
   - it: should have metadata labels component
     asserts: 
       - equal:
-          path: metadata.labels.[app.kubernetes.io/component]
+          path: metadata.labels["app.kubernetes.io/component"]
           value: ozgcloud-elasticsearch-operator
 
   - it: should have rules for ozgcloudelasticsearchs resource
diff --git a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_view_role_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_view_role_test.yaml
index 5112d901aaeeaa0ca71735fcc76417364cbaafac..536103410fc720d9ed8c7fa6800c8d922d5d0952 100644
--- a/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_view_role_test.yaml
+++ b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/ozgcloud_elasticsearch_operator_view_role_test.yaml
@@ -22,17 +22,17 @@ tests:
   - it: should have metadata labels name
     asserts: 
       - equal:
-          path: metadata.labels.[app.kubernetes.io/name]
+          path: metadata.labels["app.kubernetes.io/name"]
           value: release-name
   - it: should have metadata labels instance
     asserts: 
       - equal:
-          path: metadata.labels.[app.kubernetes.io/instance]
+          path: metadata.labels["app.kubernetes.io/instance"]
           value: release-name
   - it: should have metadata labels component
     asserts: 
       - equal:
-          path: metadata.labels.[app.kubernetes.io/component]
+          path: metadata.labels["app.kubernetes.io/component"]
           value: ozgcloud-elasticsearch-operator
 
   - it: should have rules for ozgcloudelasticsearchs resource
diff --git a/ozgcloud-keycloak-operator/run_helm_test.sh b/ozgcloud-keycloak-operator/run_helm_test.sh
index 8097a39a04ff100d5c9350e205d942100dd37894..44b6c307143f31f5a3fcfe4e41f30063089c59e5 100755
--- a/ozgcloud-keycloak-operator/run_helm_test.sh
+++ b/ozgcloud-keycloak-operator/run_helm_test.sh
@@ -4,4 +4,4 @@ set -e
 
 helm template  ./src/main/helm/ -f src/test/helm/linter_values.yaml
 helm lint -f src/test/helm/linter_values.yaml ./src/main/helm/
-cd src/main/helm && helm unittest --helm3 -f '../../test/helm/*/*.yaml' -f '../../test/helm/*.yaml' .
+cd src/main/helm && helm unittest -f '../../test/helm/*/*.yaml'  .