diff --git a/clusters/kairos/samba-csi/helmrelease.yaml b/clusters/kairos/samba-csi/helmrelease.yaml
new file mode 100644
index 0000000..9a44ec6
--- /dev/null
+++ b/clusters/kairos/samba-csi/helmrelease.yaml
@@ -0,0 +1,16 @@
+
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: csi-driver-smb
+  namespace: kube-system
+spec:
+  interval: 15m
+  releaseName: csi-driver-smb
+  chart:
+    spec:
+      chart: charts/v1.17.0
+      sourceRef:
+        kind: GitRepository
+        name: csi-driver-smb-repo
+  targetNamespace: kube-system
\ No newline at end of file
diff --git a/clusters/kairos/samba-csi/helmrepo.yaml b/clusters/kairos/samba-csi/helmrepo.yaml
new file mode 100644
index 0000000..824efe2
--- /dev/null
+++ b/clusters/kairos/samba-csi/helmrepo.yaml
@@ -0,0 +1,13 @@
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: GitRepository
+metadata:
+  name: csi-driver-smb-repo
+  namespace: kube-system
+spec:
+  interval: 15m
+  url: https://github.com/kubernetes-csi/csi-driver-smb.git
+  ignore: |-
+    # exclude all
+    /*
+    # include charts directory
+    !/charts/
\ No newline at end of file
diff --git a/clusters/kairos/samba-csi/kustomization.yaml b/clusters/kairos/samba-csi/kustomization.yaml
new file mode 100644
index 0000000..4de7c24
--- /dev/null
+++ b/clusters/kairos/samba-csi/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- helmrelease.yaml
+- helmrepo.yaml
\ No newline at end of file
diff --git a/clusters/kairos/samba/configmap.yaml b/clusters/kairos/samba-server/configmap.yaml
similarity index 100%
rename from clusters/kairos/samba/configmap.yaml
rename to clusters/kairos/samba-server/configmap.yaml
diff --git a/clusters/kairos/samba/deployment.yaml b/clusters/kairos/samba-server/deployment.yaml
similarity index 100%
rename from clusters/kairos/samba/deployment.yaml
rename to clusters/kairos/samba-server/deployment.yaml
diff --git a/clusters/kairos/samba/kustomization.yaml b/clusters/kairos/samba-server/kustomization.yaml
similarity index 100%
rename from clusters/kairos/samba/kustomization.yaml
rename to clusters/kairos/samba-server/kustomization.yaml