diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index f4cb1545..1b28d260 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -113,7 +113,7 @@ jobs:
             terraform state rm \
               module.spectrum.helm_release.flux-sync \
               module.spectrum.helm_release.flux \
-              module.spectrum.helm_release.cilium
+              module.spectrum.helm_release.cilium || true
             terraform destroy -auto-approve 
             terraform workspace delete ${{ steps.sanitize.outputs.workspace }}
           ;;
diff --git a/flux/components/kubevirt/ks.yml b/flux/components/kubevirt/ks.yml
index a1cacebd..103b7c25 100644
--- a/flux/components/kubevirt/ks.yml
+++ b/flux/components/kubevirt/ks.yml
@@ -1,11 +1,11 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
 kind: Kustomization
 metadata:
-  name: kube-virt
+  name: kubevirt
   namespace: flux-system
 spec:
   interval: 1m0s
-  path: ./flux/components/kube-virt/app
+  path: ./flux/components/kubevirt/app
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/flux/core/lightmare/app/kustomization.yml b/flux/core/lightmare/app/kustomization.yml
new file mode 100644
index 00000000..5e2cfad0
--- /dev/null
+++ b/flux/core/lightmare/app/kustomization.yml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - namespace.yml
+  - repository.yml
+  - release.yml
diff --git a/flux/core/lightmare/app/namespace.yml b/flux/core/lightmare/app/namespace.yml
new file mode 100644
index 00000000..3ab1abcd
--- /dev/null
+++ b/flux/core/lightmare/app/namespace.yml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: lightmare
diff --git a/flux/core/lightmare/app/release.yml b/flux/core/lightmare/app/release.yml
new file mode 100644
index 00000000..647d7be6
--- /dev/null
+++ b/flux/core/lightmare/app/release.yml
@@ -0,0 +1,16 @@
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: lightmare
+  namespace: lightmare
+spec:
+  interval: 5m
+  chartRef:
+    kind: OCIRepository
+    name: lightmare
+    namespace: flux-system
+  values:
+    image:
+      repository: fluencelabs/lightmare
+      tag: main
+      pullPolicy: Always
diff --git a/flux/core/lightmare/app/repository.yml b/flux/core/lightmare/app/repository.yml
new file mode 100644
index 00000000..65a4c012
--- /dev/null
+++ b/flux/core/lightmare/app/repository.yml
@@ -0,0 +1,10 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: lightmare
+  namespace: flux-system
+spec:
+  interval: 5m0s
+  url: oci://registry-1.docker.io/fluencelabs/lightmare-chart
+  ref:
+    tag: 0.1.0
diff --git a/flux/core/lightmare/ks.yml b/flux/core/lightmare/ks.yml
new file mode 100644
index 00000000..7db38e49
--- /dev/null
+++ b/flux/core/lightmare/ks.yml
@@ -0,0 +1,13 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+kind: Kustomization
+metadata:
+  name: lightmare
+  namespace: flux-system
+spec:
+  interval: 1m0s
+  path: ./flux/core/lightmare/app
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: spectrum
+    namespace: flux-system
diff --git a/flux/core/lightmare/kustomization.yml b/flux/core/lightmare/kustomization.yml
new file mode 100644
index 00000000..d1943374
--- /dev/null
+++ b/flux/core/lightmare/kustomization.yml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ks.yaml
diff --git a/terraform-modules/spectrum/templates/flux-sync.yml b/terraform-modules/spectrum/templates/flux-sync.yml
index 41615ae2..2425bcd9 100644
--- a/terraform-modules/spectrum/templates/flux-sync.yml
+++ b/terraform-modules/spectrum/templates/flux-sync.yml
@@ -22,5 +22,5 @@ kustomization:
 kustomizationlist:
   - spec:
       interval: 1m0s
-      path: "./flux/components/lightmare/app"
+      path: "./flux/core/lightmare/app"
       prune: true