diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 264453541af7a2c64014dc9f50d0a3ae9b224e7e..ff0570c4e5b736d16eacbd77b5441da057920c26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,8 @@ package tests:
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang logging-operator
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang efk
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang twistlock
-
+    - kubectl wait --for=condition=Ready --timeout 900s helmrelease -n bigbang cluster-auditor
+    
     # Show all deployed resources
     - kubectl get all -A
 
diff --git a/chart/templates/clusterauditor/clusterauditor-helmrelease.yaml b/chart/templates/clusterauditor/clusterauditor-helmrelease.yaml
index 19fbcc87123b664766cad71b9c7ffd92b49fd96e..5141182f5558e116ab402250287e13484d959400 100644
--- a/chart/templates/clusterauditor/clusterauditor-helmrelease.yaml
+++ b/chart/templates/clusterauditor/clusterauditor-helmrelease.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.gatekeeper.enabled }}
+{{- if .Values.clusterAuditor.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
@@ -30,14 +30,8 @@ spec:
     timeout: {{ .rollback.timeout }}
     cleanupOnFail: {{ .rollback.cleanupOnFail }}
   {{- end }}
-
   values:
     #conversion from umbrella values to package values
-    image:
-      repository: registry1.dsop.io/ironbank/opensource/openpolicyagent/gatekeeper
-      release: v3.1.2
-    disableValidatingWebhook: true
-    createNamespace: false
     {{- if and (ne .Values.registryCredentials.username "") (ne .Values.registryCredentials.password "") }}
     imagePullSecrets: [ private-registry ]
     {{- end }}
@@ -45,13 +39,9 @@ spec:
   - name: values
     kind: Secret
     valuesKey: "clusterauditor.yaml"
-  {{- if .Values.certmanager.enabled }}
   dependsOn:
-  - name: gatekeeper
-    namespace: {{ .Release.Namespace }}
   - name: eck-operator
     namespace: {{ .Release.Namespace }}
   - name: cluster-auditor-policies
     namespace: {{ .Release.Namespace}}
-  {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/chart/templates/clusterauditor/clusterauditor-policies-helmrelease.yaml b/chart/templates/clusterauditor/clusterauditor-policies-helmrelease.yaml
index 73ae803e6fcbf9f00aed1ee3bbe4d7eccf496b73..b507cf9274aca53d40fe93988d3b6f0126c10cb5 100644
--- a/chart/templates/clusterauditor/clusterauditor-policies-helmrelease.yaml
+++ b/chart/templates/clusterauditor/clusterauditor-policies-helmrelease.yaml
@@ -5,6 +5,7 @@ metadata:
   name: cluster-auditor-policies
   namespace: {{ .Release.Namespace }}
 spec:
+  targetNamespace: cluster-auditor
   chart:
     spec:
       chart: charts/policies
@@ -38,7 +39,5 @@ spec:
   dependsOn:
   - name: gatekeeper
     namespace: {{ .Release.Namespace }}
-  - name: eck-operator
-    namespace: {{ .Release.Namespace }}
   {{- end }}
 {{- end }}
\ No newline at end of file