diff --git a/registry/clusters/dev/components/cert-manager.yaml b/registry/clusters/dev/components/10-cert-manager.yaml
similarity index 100%
rename from registry/clusters/dev/components/cert-manager.yaml
rename to registry/clusters/dev/components/10-cert-manager.yaml
diff --git a/registry/clusters/dev/components/external-secrets.yaml b/registry/clusters/dev/components/10-external-secrets.yaml
similarity index 100%
rename from registry/clusters/dev/components/external-secrets.yaml
rename to registry/clusters/dev/components/10-external-secrets.yaml
diff --git a/registry/clusters/dev/components/metallb.yaml b/registry/clusters/dev/components/10-metallb.yaml
similarity index 100%
rename from registry/clusters/dev/components/metallb.yaml
rename to registry/clusters/dev/components/10-metallb.yaml
diff --git a/registry/clusters/dev/components/reloader.yaml b/registry/clusters/dev/components/10-reloader.yaml
similarity index 100%
rename from registry/clusters/dev/components/reloader.yaml
rename to registry/clusters/dev/components/10-reloader.yaml
diff --git a/registry/clusters/dev/components/tailscale.yaml b/registry/clusters/dev/components/10-tailscale.yaml
similarity index 100%
rename from registry/clusters/dev/components/tailscale.yaml
rename to registry/clusters/dev/components/10-tailscale.yaml
diff --git a/registry/clusters/dev/components/dex.yaml b/registry/clusters/dev/components/20-dex.yaml
similarity index 100%
rename from registry/clusters/dev/components/dex.yaml
rename to registry/clusters/dev/components/20-dex.yaml
diff --git a/registry/clusters/dev/components/ingress-nginx.yaml b/registry/clusters/dev/components/20-ingress-nginx.yaml
similarity index 100%
rename from registry/clusters/dev/components/ingress-nginx.yaml
rename to registry/clusters/dev/components/20-ingress-nginx.yaml
diff --git a/registry/clusters/dev/components/monitoring.yaml b/registry/clusters/dev/components/20-monitoring.yaml
similarity index 100%
rename from registry/clusters/dev/components/monitoring.yaml
rename to registry/clusters/dev/components/20-monitoring.yaml
diff --git a/registry/clusters/dev/components/external-dns.yaml b/registry/clusters/dev/components/30-external-dns.yaml
similarity index 100%
rename from registry/clusters/dev/components/external-dns.yaml
rename to registry/clusters/dev/components/30-external-dns.yaml
diff --git a/registry/clusters/dev/components/unifi.yaml b/registry/clusters/dev/components/30-unifi.yaml
similarity index 100%
rename from registry/clusters/dev/components/unifi.yaml
rename to registry/clusters/dev/components/30-unifi.yaml
diff --git a/registry/clusters/dev/components/fission.yaml b/registry/clusters/dev/components/40-fission.yaml
similarity index 96%
rename from registry/clusters/dev/components/fission.yaml
rename to registry/clusters/dev/components/40-fission.yaml
index 0a2be23..13900e6 100644
--- a/registry/clusters/dev/components/fission.yaml
+++ b/registry/clusters/dev/components/40-fission.yaml
@@ -4,7 +4,7 @@ metadata:
   name: fission-components
   namespace: argocd
   annotations:
-    argocd.argoproj.io/sync-wave: "10"
+    argocd.argoproj.io/sync-wave: "40"
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
diff --git a/registry/clusters/dev/components/homepage.yaml b/registry/clusters/dev/components/40-homepage.yaml
similarity index 100%
rename from registry/clusters/dev/components/homepage.yaml
rename to registry/clusters/dev/components/40-homepage.yaml
diff --git a/registry/clusters/prod/components/cert-manager.yaml b/registry/clusters/prod/components/10-cert-manager.yaml
similarity index 100%
rename from registry/clusters/prod/components/cert-manager.yaml
rename to registry/clusters/prod/components/10-cert-manager.yaml
diff --git a/registry/clusters/prod/components/external-secrets.yaml b/registry/clusters/prod/components/10-external-secrets.yaml
similarity index 100%
rename from registry/clusters/prod/components/external-secrets.yaml
rename to registry/clusters/prod/components/10-external-secrets.yaml
diff --git a/registry/clusters/prod/components/metallb.yaml b/registry/clusters/prod/components/10-metallb.yaml
similarity index 100%
rename from registry/clusters/prod/components/metallb.yaml
rename to registry/clusters/prod/components/10-metallb.yaml
diff --git a/registry/clusters/prod/components/reloader.yaml b/registry/clusters/prod/components/10-reloader.yaml
similarity index 100%
rename from registry/clusters/prod/components/reloader.yaml
rename to registry/clusters/prod/components/10-reloader.yaml
diff --git a/registry/clusters/prod/components/tailscale.yaml b/registry/clusters/prod/components/10-tailscale.yaml
similarity index 100%
rename from registry/clusters/prod/components/tailscale.yaml
rename to registry/clusters/prod/components/10-tailscale.yaml
diff --git a/registry/clusters/prod/components/dex.yaml b/registry/clusters/prod/components/20-dex.yaml
similarity index 100%
rename from registry/clusters/prod/components/dex.yaml
rename to registry/clusters/prod/components/20-dex.yaml
diff --git a/registry/clusters/prod/components/ingress-nginx.yaml b/registry/clusters/prod/components/20-ingress-nginx.yaml
similarity index 100%
rename from registry/clusters/prod/components/ingress-nginx.yaml
rename to registry/clusters/prod/components/20-ingress-nginx.yaml
diff --git a/registry/clusters/prod/components/monitoring.yaml b/registry/clusters/prod/components/20-monitoring.yaml
similarity index 100%
rename from registry/clusters/prod/components/monitoring.yaml
rename to registry/clusters/prod/components/20-monitoring.yaml
diff --git a/registry/clusters/prod/components/pihole-ingress.yaml b/registry/clusters/prod/components/20-pihole-ingress.yaml
similarity index 100%
rename from registry/clusters/prod/components/pihole-ingress.yaml
rename to registry/clusters/prod/components/20-pihole-ingress.yaml
diff --git a/registry/clusters/prod/components/external-dns.yaml b/registry/clusters/prod/components/30-external-dns.yaml
similarity index 100%
rename from registry/clusters/prod/components/external-dns.yaml
rename to registry/clusters/prod/components/30-external-dns.yaml
diff --git a/registry/clusters/prod/components/unifi.yaml b/registry/clusters/prod/components/30-unifi.yaml
similarity index 100%
rename from registry/clusters/prod/components/unifi.yaml
rename to registry/clusters/prod/components/30-unifi.yaml
diff --git a/registry/clusters/prod/components/fission.yaml b/registry/clusters/prod/components/40-fission.yaml
similarity index 93%
rename from registry/clusters/prod/components/fission.yaml
rename to registry/clusters/prod/components/40-fission.yaml
index b8af92b..0f79b90 100644
--- a/registry/clusters/prod/components/fission.yaml
+++ b/registry/clusters/prod/components/40-fission.yaml
@@ -4,7 +4,7 @@ metadata:
   name: fission-components
   namespace: argocd
   annotations:
-    argocd.argoproj.io/sync-wave: "10"
+    argocd.argoproj.io/sync-wave: "40"
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
diff --git a/registry/clusters/prod/components/homepage.yaml b/registry/clusters/prod/components/40-homepage.yaml
similarity index 100%
rename from registry/clusters/prod/components/homepage.yaml
rename to registry/clusters/prod/components/40-homepage.yaml