diff --git a/flux2/cluster/base/core.yaml b/flux2/cluster/base/core.yaml
index 169fadf0e22a95f6249c8088929e26b35edd49cc..1ab36950217f0841f2b89a5c8a4015d937eaa154 100644
--- a/flux2/cluster/base/core.yaml
+++ b/flux2/cluster/base/core.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
 kind: Kustomization
 metadata:
@@ -21,3 +22,16 @@ spec:
         name: oas-oauth-variables
       - kind: Secret
         name: oas-cluster-variables
+  healthChecks:
+    - apiVersion: helm.toolkit.fluxcd.io/v1beta1
+      kind: HelmRelease
+      name: metallb
+      namespace: kube-system
+    - apiVersion: helm.toolkit.fluxcd.io/v1beta1
+      kind: HelmRelease
+      name: nginx
+      namespace: oas
+    - apiVersion: helm.toolkit.fluxcd.io/v1beta1
+      kind: HelmRelease
+      name: single-sign-on
+      namespace: oas
diff --git a/flux2/cluster/base/infrastructure.yaml b/flux2/cluster/base/infrastructure.yaml
index e61922d929cb4620eddd792513a3b15819c58360..5de7ecd6ee7b75e5f19cb89006e4e13bf118bf08 100644
--- a/flux2/cluster/base/infrastructure.yaml
+++ b/flux2/cluster/base/infrastructure.yaml
@@ -21,10 +21,6 @@ spec:
       kind: HelmRelease
       name: local-path-provisioner
       namespace: kube-system
-    - apiVersion: helm.toolkit.fluxcd.io/v1beta1
-      kind: HelmRelease
-      name: nginx
-      namespace: oas
     - apiVersion: helm.toolkit.fluxcd.io/v1beta1
       kind: HelmRelease
       name: oas-secrets
diff --git a/flux2/infrastructure/nginx/kustomization.yaml b/flux2/core/base/nginx/kustomization.yaml
similarity index 100%
rename from flux2/infrastructure/nginx/kustomization.yaml
rename to flux2/core/base/nginx/kustomization.yaml
diff --git a/flux2/infrastructure/nginx/release.yaml b/flux2/core/base/nginx/release.yaml
similarity index 97%
rename from flux2/infrastructure/nginx/release.yaml
rename to flux2/core/base/nginx/release.yaml
index b96f365843fb9c7020904c0148d3d828b48f6698..d2bf5270e36b3fcf84cd8ead24f4266639f95132 100644
--- a/flux2/infrastructure/nginx/release.yaml
+++ b/flux2/core/base/nginx/release.yaml
@@ -18,6 +18,8 @@ spec:
     remediation:
       retries: 3
     timeout: 9m
+  dependsOn:
+    - name: metallb
   values:
     controller:
       image:
diff --git a/flux2/core/base/single-sign-on/release.yaml b/flux2/core/base/single-sign-on/release.yaml
index 1fe758902d1ab01c18f9e4e37de4c87b615809e8..fda4dbbb515726d684575e1b74a91192d6b3b5b1 100644
--- a/flux2/core/base/single-sign-on/release.yaml
+++ b/flux2/core/base/single-sign-on/release.yaml
@@ -19,7 +19,6 @@ spec:
   install:
     remediation:
       retries: 3
-
   values:
     singleSignOnHost: &SSO_HOST "sso.${domain}"