diff --git a/chart/templates/certmanager/cert-manager-helmrelease.yaml b/chart/templates/certmanager/cert-manager-helmrelease.yaml
index 23c811f3df72a97013c6aa162c7780e70e30e842..9fe04b15609cdb67d60ec0be8dedfa4af094b89a 100644
--- a/chart/templates/certmanager/cert-manager-helmrelease.yaml
+++ b/chart/templates/certmanager/cert-manager-helmrelease.yaml
@@ -2,7 +2,7 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: {{ .Release.Name }}-cert-manager
+  name: {{ .Release.Name }}-certmanager
   namespace: {{ .Release.Namespace }}
 spec:
   targetNamespace: cert-manager
diff --git a/chart/templates/certmanager/gitrepository.yaml b/chart/templates/certmanager/gitrepository.yaml
index 962958e03c281fcaa41af7715e811d8d03696324..dbac7ee7c8dd01b6c39a9c9a922ec8ffe4b60152 100644
--- a/chart/templates/certmanager/gitrepository.yaml
+++ b/chart/templates/certmanager/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if or (not .Values.global.offline) .Values.certmanager.enabled }}
+{{- if and (not .Values.global.offline) .Values.certmanager.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
diff --git a/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml b/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml
index b74c9f1b14de9f11a90a9e03a698dd3e94d623e9..673ea16081b602ec72c14c206a2743217823023e 100644
--- a/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml
+++ b/chart/templates/gatekeeper/gatekeeper-helmrelease.yaml
@@ -43,7 +43,10 @@ spec:
     - name: env-values
       kind: Secret
       optional: true
+
+  {{- if .Values.certmanager.enabled }}
   dependsOn:
   - name: {{ .Release.Name }}-certmanager
     namespace: {{ .Release.Namespace }}
+  {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/chart/templates/gatekeeper/gitrepository.yaml b/chart/templates/gatekeeper/gitrepository.yaml
index 1076220ca7c3e00f2ad3a773c991408b63ebfcab..59c1442b7dae068c8af34d2e2c6e75bc5e2e8d59 100644
--- a/chart/templates/gatekeeper/gitrepository.yaml
+++ b/chart/templates/gatekeeper/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if or (not .Values.global.offline) .Values.gatekeeper.enabled }}
+{{- if and (not .Values.global.offline) .Values.gatekeeper.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
diff --git a/chart/templates/istio/gitrepository.yaml b/chart/templates/istio/gitrepository.yaml
index 47261a78740976f061ca71a5fa44a5a89ab724a8..f218fbb37b811a65f9ca86a8c66b467b7d1e7539 100644
--- a/chart/templates/istio/gitrepository.yaml
+++ b/chart/templates/istio/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if or (not .Values.global.offline) .Values.istio.enabled }}
+{{- if and (not .Values.global.offline) .Values.istio.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
diff --git a/chart/templates/logging/gitrepository.yaml b/chart/templates/logging/gitrepository.yaml
index 3e65d649e0c92f4519a141248fde18b417383d06..416623db923aede21f13301912980aecffe5e531 100644
--- a/chart/templates/logging/gitrepository.yaml
+++ b/chart/templates/logging/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if or (not .Values.global.offline) .Values.logging.enabled }}
+{{- if and (not .Values.global.offline) .Values.logging.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
diff --git a/chart/templates/monitoring/gitrepository.yaml b/chart/templates/monitoring/gitrepository.yaml
index 828aa63fa896622a8d17a17605d72cea2dcbf657..ae9e2b4c227cd0946ff4dd49845871b0c2261dd9 100644
--- a/chart/templates/monitoring/gitrepository.yaml
+++ b/chart/templates/monitoring/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if or (not .Values.global.offline) .Values.monitoring.enabled }}
+{{- if and (not .Values.global.offline) .Values.monitoring.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
diff --git a/chart/templates/twistlock/gitrepository.yaml b/chart/templates/twistlock/gitrepository.yaml
index 66b4be27dccdcf56f32143c64ad4a4c671825912..5e914d217632686fb1c69ed7e6b4544fb73b65c7 100644
--- a/chart/templates/twistlock/gitrepository.yaml
+++ b/chart/templates/twistlock/gitrepository.yaml
@@ -1,4 +1,4 @@
-{{- if or (not .Values.global.offline) .Values.twistlock.enabled }}
+{{- if and (not .Values.global.offline) .Values.twistlock.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata: