diff --git a/kubernetes/main/apps/flux-system/flux/app/helm-values.yaml b/kubernetes/main/apps/flux-system/flux/app/helm-values.yaml
index 863e666f81321..bd077baa4e183 100644
--- a/kubernetes/main/apps/flux-system/flux/app/helm-values.yaml
+++ b/kubernetes/main/apps/flux-system/flux/app/helm-values.yaml
@@ -1,6 +1,11 @@
 ---
+# Graceful Helmfile to HelmRelease takeover
+x-shared-labels: &labels
+  helm.toolkit.fluxcd.io/name: flux
+  helm.toolkit.fluxcd.io/namespace: flux-system
+
 crds:
-  annotations: 
+  annotations:
     helm.sh/resource-policy: keep
 
 helmController:
@@ -15,6 +20,7 @@ helmController:
       - --feature-gates=OOMWatch=true
       - --oom-watch-memory-threshold=95
       - --oom-watch-interval=500ms
+  labels: *labels
   resources:
     requests:
       cpu: 100m
@@ -34,6 +40,7 @@ kustomizeController:
       # Ref: https://fluxcd.io/flux/installation/configuration/vertical-scaling/#increase-the-number-of-workers-and-limits
       - --concurrent=10
       - --requeue-dependency=5s
+  labels: *labels
   resources:
     requests:
       cpu: 100m
@@ -41,6 +48,7 @@ kustomizeController:
       memory: 2Gi
 
 notificationController:
+  labels: *labels
   resources:
     requests:
       cpu: 100m
@@ -48,6 +56,7 @@ notificationController:
       memory: 2Gi
 
 sourceController:
+  labels: *labels
   container:
     additionalArgs:
       # Enable Helm repositories caching
diff --git a/kubernetes/main/apps/flux-system/flux/app/helmrelease.yaml b/kubernetes/main/apps/flux-system/flux/app/helmrelease.yaml
index a384b9c4f52e5..f1e10863b8600 100644
--- a/kubernetes/main/apps/flux-system/flux/app/helmrelease.yaml
+++ b/kubernetes/main/apps/flux-system/flux/app/helmrelease.yaml
@@ -19,6 +19,7 @@ spec:
       retries: 3
   upgrade:
     cleanupOnFail: true
+    disableWait: true
     remediation:
       strategy: rollback
       retries: 3
diff --git a/kubernetes/main/apps/kube-system/cilium/app/helm-values.yaml b/kubernetes/main/apps/kube-system/cilium/app/helm-values.yaml
index f9c891ae88952..a2298e604a1f6 100644
--- a/kubernetes/main/apps/kube-system/cilium/app/helm-values.yaml
+++ b/kubernetes/main/apps/kube-system/cilium/app/helm-values.yaml
@@ -78,3 +78,7 @@ securityContext:
       - NET_ADMIN
       - SYS_ADMIN
       - SYS_RESOURCE
+# Graceful Helmfile to HelmRelease takeover
+commonLabels:
+  helm.toolkit.fluxcd.io/name: cilium
+  helm.toolkit.fluxcd.io/namespace: kube-system
diff --git a/kubernetes/main/apps/kube-system/cilium/app/helmrelease.yaml b/kubernetes/main/apps/kube-system/cilium/app/helmrelease.yaml
index 598bacbb55d8e..814acd7220d33 100644
--- a/kubernetes/main/apps/kube-system/cilium/app/helmrelease.yaml
+++ b/kubernetes/main/apps/kube-system/cilium/app/helmrelease.yaml
@@ -25,32 +25,33 @@ spec:
   valuesFrom:
     - kind: ConfigMap
       name: cilium-helm-values
-  values:
-    hubble:
-      enabled: true
-      metrics:
-        enabled:
-          - dns:query
-          - drop
-          - tcp
-          - flow
-          - port-distribution
-          - icmp
-          - http
-        serviceMonitor:
-          enabled: true
-        dashboards:
-          enabled: true
-      relay:
-        enabled: true
-        rollOutPods: true
-        prometheus:
-          serviceMonitor:
-            enabled: true
-      ui:
-        enabled: true
-        rollOutPods: true
-        ingress:
-          enabled: true
-          className: internal
-          hosts: ["hubble.devbu.io"]
+  # Enable Hubble, Hubble Relay and Hubble UI
+  # values:
+  #   hubble:
+  #     enabled: true
+  #     metrics:
+  #       enabled:
+  #         - dns:query
+  #         - drop
+  #         - tcp
+  #         - flow
+  #         - port-distribution
+  #         - icmp
+  #         - http
+  #       serviceMonitor:
+  #         enabled: true
+  #       dashboards:
+  #         enabled: true
+  #     relay:
+  #       enabled: true
+  #       rollOutPods: true
+  #       prometheus:
+  #         serviceMonitor:
+  #           enabled: true
+  #     ui:
+  #       enabled: true
+  #       rollOutPods: true
+  #       ingress:
+  #         enabled: true
+  #         className: internal
+  #         hosts: ["hubble.devbu.io"]
diff --git a/kubernetes/main/apps/kube-system/coredns/app/helm-values.yaml b/kubernetes/main/apps/kube-system/coredns/app/helm-values.yaml
index 93c499671a7cb..776a225f6889d 100644
--- a/kubernetes/main/apps/kube-system/coredns/app/helm-values.yaml
+++ b/kubernetes/main/apps/kube-system/coredns/app/helm-values.yaml
@@ -49,3 +49,7 @@ tolerations:
   - key: node-role.kubernetes.io/control-plane
     operator: Exists
     effect: NoSchedule
+# Graceful Helmfile to HelmRelease takeover
+customLabels:
+  helm.toolkit.fluxcd.io/name: coredns
+  helm.toolkit.fluxcd.io/namespace: kube-system
diff --git a/kubernetes/main/apps/kube-system/spegel/app/helm-values.yaml b/kubernetes/main/apps/kube-system/spegel/app/helm-values.yaml
index 47b5e60462f6a..137703cfe6bcc 100644
--- a/kubernetes/main/apps/kube-system/spegel/app/helm-values.yaml
+++ b/kubernetes/main/apps/kube-system/spegel/app/helm-values.yaml
@@ -10,3 +10,7 @@ serviceMonitor:
   enabled: true
 grafanaDashboard:
   enabled: true
+# Graceful Helmfile to HelmRelease takeover
+commonLabels:
+  helm.toolkit.fluxcd.io/name: spegel
+  helm.toolkit.fluxcd.io/namespace: kube-system