diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff0570c4e5b736d16eacbd77b5441da057920c26..fd4de89a063412ae8271d99e7cdb9b28c2fb9c5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,8 +43,8 @@ package tests:
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang istio-operator
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang istio
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang eck-operator
-    - 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 ek
+    - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang fluent-bit
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang twistlock
     - kubectl wait --for=condition=Ready --timeout 900s helmrelease -n bigbang cluster-auditor
     
diff --git a/chart/templates/logging/efk-helmrelease.yaml b/chart/templates/logging/ek-helmrelease.yaml
similarity index 91%
rename from chart/templates/logging/efk-helmrelease.yaml
rename to chart/templates/logging/ek-helmrelease.yaml
index f7efe852638486903149c370288f7147ada8b742..68e45b054b39798936b82324c35193326b63fb14 100644
--- a/chart/templates/logging/efk-helmrelease.yaml
+++ b/chart/templates/logging/ek-helmrelease.yaml
@@ -2,13 +2,13 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: efk
+  name: ek
   namespace: {{ .Release.Namespace }}
 spec:
   targetNamespace: logging
   chart:
     spec:
-      chart: charts/logging
+      chart: charts/elasticsearch-kibana
       interval: 5m
       sourceRef:
         kind: GitRepository
@@ -44,8 +44,6 @@ spec:
   dependsOn:
     - name: eck-operator
       namespace: {{ .Release.Namespace }}
-    - name: logging-operator
-      namespace: {{ .Release.Namespace }}
 
     {{- if  .Values.gatekeeper.enabled }}
     - name: gatekeeper
diff --git a/chart/templates/logging/logging-operator-helmrelease.yaml b/chart/templates/logging/fluentbit-helmrelease.yaml
similarity index 62%
rename from chart/templates/logging/logging-operator-helmrelease.yaml
rename to chart/templates/logging/fluentbit-helmrelease.yaml
index c723cc47ce14d1697ab41092d80fa7ffd6ca5ea7..ccad5489f1f21ece484a6835654bbf413217f8ce 100644
--- a/chart/templates/logging/logging-operator-helmrelease.yaml
+++ b/chart/templates/logging/fluentbit-helmrelease.yaml
@@ -2,13 +2,13 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
-  name: logging-operator
+  name: fluent-bit
   namespace: {{ .Release.Namespace }}
 spec:
   targetNamespace: logging
   chart:
     spec:
-      chart: charts/logging-operator
+      chart: charts/fluent-bit
       interval: 5m
       sourceRef:
         kind: GitRepository
@@ -33,11 +33,23 @@ spec:
   {{- end }}
 
   values:
-    createCustomResource: false
+    elasticsearch:
+      host: "logging-ek-es-http"
+      password:
+        secret: "logging-ek-es-elastic-user"
 
-  {{- if .Values.gatekeeper.enabled }}
+  {{/* ECK and Logging _always_ depend on .Values.logging being enabled, so can assume they exist here */}}
   dependsOn:
+    - name: ek
+      namespace: {{ .Release.Namespace }}
+
+    {{- if  .Values.gatekeeper.enabled }}
     - name: gatekeeper
       namespace: {{ .Release.Namespace }}
+    {{- end }}
+
+    {{- if .Values.istio.enabled }}
+    - name: istio
+      namespace: {{ .Release.Namespace }}
   {{- end }}
-{{- end }}
\ No newline at end of file
+  {{- end }}
\ No newline at end of file
diff --git a/chart/templates/logging/namespace.yaml b/chart/templates/logging/namespace.yaml
index c6fc6ee462c44cc232829d4d1c5494d4f7739b5a..4a1389ebc4ff7de1b6784565bd311dde9391bbf8 100644
--- a/chart/templates/logging/namespace.yaml
+++ b/chart/templates/logging/namespace.yaml
@@ -1,10 +1,18 @@
 {{- if or .Values.logging.enabled .Values.clusterAuditor.enabled }}
 apiVersion: v1
 kind: Namespace
+metadata:
+  name: eck-operator
+
+---
+apiVersion: v1
+kind: Namespace
 metadata:
   name: logging
+  {{- if .Values.istio.enabled }}
   labels:
     istio-injection: enabled
+  {{- end}}
 
 ---
   {{- if and (ne .Values.registryCredentials.username "") (ne .Values.registryCredentials.password "") }}