diff --git a/infrastructure/core/kustomization.yaml b/infrastructure/core/kustomization.yaml
new file mode 100644
index 00000000..79b2d200
--- /dev/null
+++ b/infrastructure/core/kustomization.yaml
@@ -0,0 +1,7 @@
+# infrastructure/core/kustomization.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - sc-asteria.yaml
+  - sc-astreae.yaml
+  - pc-scavenger.yaml  
diff --git a/infrastructure/core/sc-asteria.yaml b/infrastructure/core/sc-asteria.yaml
index 61b22e22..dac21c9e 100644
--- a/infrastructure/core/sc-asteria.yaml
+++ b/infrastructure/core/sc-asteria.yaml
@@ -1,3 +1,4 @@
+# infrastructure/core/sc-asteria.yaml
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
diff --git a/infrastructure/core/sc-astreae.yaml b/infrastructure/core/sc-astreae.yaml
index 2ca8a9a1..05ab19b5 100644
--- a/infrastructure/core/sc-astreae.yaml
+++ b/infrastructure/core/sc-astreae.yaml
@@ -1,3 +1,4 @@
+# infrastructure/core/sc-astreae.yaml
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
diff --git a/infrastructure/flux-system/kustomization-core.yaml b/infrastructure/flux-system/kustomization-core.yaml
new file mode 100644
index 00000000..38b9409c
--- /dev/null
+++ b/infrastructure/flux-system/kustomization-core.yaml
@@ -0,0 +1,16 @@
+# infrastructure/flux-system/kustomization-core.yaml
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: core
+  namespace: flux-system
+spec:
+  interval: 10m
+  path: ./infrastructure/core
+  prune: false
+  sourceRef:
+    kind: GitRepository
+    name: flux-system
+    namespace: flux-system
+  wait: true
+  
\ No newline at end of file
diff --git a/infrastructure/flux-system/kustomization-crypto.yaml b/infrastructure/flux-system/kustomization-crypto.yaml
index 095ddd1c..aaa38d19 100644
--- a/infrastructure/flux-system/kustomization-crypto.yaml
+++ b/infrastructure/flux-system/kustomization-crypto.yaml
@@ -1,4 +1,4 @@
-# infrastructure/kustomization-crypto.yaml
+# infrastructure/flux-system/kustomization-crypto.yaml
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
@@ -14,4 +14,3 @@ spec:
     name: flux-system
     namespace: flux-system
   wait: true
-  
\ No newline at end of file
diff --git a/infrastructure/flux-system/kustomization-gitea.yaml b/infrastructure/flux-system/kustomization-gitea.yaml
index bfa31698..62bff3f4 100644
--- a/infrastructure/flux-system/kustomization-gitea.yaml
+++ b/infrastructure/flux-system/kustomization-gitea.yaml
@@ -1,4 +1,4 @@
-# infrastructure/kustomization-gitea.yaml
+# infrastructure/flux-system/kustomization-gitea.yaml
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
diff --git a/infrastructure/flux-system/kustomization-monerod.yaml b/infrastructure/flux-system/kustomization-monerod.yaml
index 980134cf..dbb58b77 100644
--- a/infrastructure/flux-system/kustomization-monerod.yaml
+++ b/infrastructure/flux-system/kustomization-monerod.yaml
@@ -1,4 +1,4 @@
-# infrastructure/kustomization-monerod.yaml
+# infrastructure/flux-system/kustomization-monerod.yaml
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
@@ -17,4 +17,3 @@ spec:
     - name: crypto
   wait: true
   timeout: 5m
-  
\ No newline at end of file
diff --git a/infrastructure/flux-system/kustomization-xmr-miner.yaml b/infrastructure/flux-system/kustomization-xmr-miner.yaml
index 87d8bb01..533038c4 100644
--- a/infrastructure/flux-system/kustomization-xmr-miner.yaml
+++ b/infrastructure/flux-system/kustomization-xmr-miner.yaml
@@ -1,3 +1,4 @@
+# infrastructure/flux-system/kustomization-core.yaml
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
diff --git a/infrastructure/flux-system/kustomization.yaml b/infrastructure/flux-system/kustomization.yaml
index 1b4dd45a..e96f6601 100644
--- a/infrastructure/flux-system/kustomization.yaml
+++ b/infrastructure/flux-system/kustomization.yaml
@@ -1,9 +1,10 @@
-# infrastructure/kustomization.yaml
+# infrastructure/flux-system/kustomization.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - gotk-components.yaml
 - gotk-sync.yaml
+- kustomization-core.yaml
 - kustomization-gitea.yaml
 - kustomization-crypto.yaml
 - kustomization-monerod.yaml
diff --git a/services/crypto/xmr-miner/kustomization.yaml b/services/crypto/xmr-miner/kustomization.yaml
index 706a2fc7..7cb85949 100644
--- a/services/crypto/xmr-miner/kustomization.yaml
+++ b/services/crypto/xmr-miner/kustomization.yaml
@@ -7,4 +7,3 @@ resources:
   - deployment.yaml
   - service.yaml
   - xmrig-daemonset.yaml
-  - priority-class.yaml