diff --git a/apps/sonarr/deployment.yaml b/apps/sonarr/deployment.yaml
index 184d379..e7d4469 100644
--- a/apps/sonarr/deployment.yaml
+++ b/apps/sonarr/deployment.yaml
@@ -80,5 +80,4 @@ spec:
           nfs:
             server: 192.168.1.100
             path: /tv
-            readOnly: true
-            
+            readOnly: true
\ No newline at end of file
diff --git a/clusters/kairos/samba-server/configmap.yaml b/clusters/kairos/samba-server/configmap.yaml
index c674a10..68f2c78 100644
--- a/clusters/kairos/samba-server/configmap.yaml
+++ b/clusters/kairos/samba-server/configmap.yaml
@@ -3,33 +3,16 @@ kind: ConfigMap
 metadata:
   name: samba-config
 data:
-  smb.default: |
-    [global]
-        server string = samba
-        security = user
-        server min protocol = SMB2
-
-        map to guest = Bad User
-        guest account = samba
-        wins support = yes
-        local master = yes
-        preferred master = yes
-        tls enabled = no
-        bind interfaces only = no
-
-        # disable printing services
-        load printers = no
-        printing = bsd
-        printcap name = /dev/null
-        disable spoolss = yes
-
+  FAIL_FAST: "true"
+  SAMBA_GLOBAL_STANZA: "map to guest = Bad User;guest account = samba;wins support = yes;load printers = no;"
+  SAMBA_VOLUME_CONFIG_share: |
     [share]
-        path = /storage
-        comment = Shared
-        valid users = @smb
-        browseable = yes
-        writable = yes
-        read only = no
+      path = /storage
+      comment = Shared
+      valid users = @smb
+      browseable = yes
+      writable = yes
+      read only = no
 
-        printable = no
-        public = yes
+      printable = no
+      public = yes
diff --git a/clusters/kairos/samba-server/deployment.yaml b/clusters/kairos/samba-server/deployment.yaml
index c3fe984..dc9fcb4 100644
--- a/clusters/kairos/samba-server/deployment.yaml
+++ b/clusters/kairos/samba-server/deployment.yaml
@@ -18,9 +18,14 @@ spec:
     spec:
       containers:
         - name: samba
-          image: dockurr/samba:latest
+          image: ghcr.io/servercontainers/samba:a3.22.0-s4.21.4-r4
           ports:
             - containerPort: 445
+          hostNetwork: true
+          securityContext:
+            privileged: true
+            capabilities:
+              add: ["NET_ADMIN"]
           resources:
             limits:
               cpu: 1000m
@@ -29,16 +34,16 @@ spec:
               cpu: 10m
               memory: 64Mi
           volumeMounts:
-            - mountPath: /storage
-              name: local-path
+            - mountPath: /shares/data
+              name: share-path
             - mountPath: /etc/samba/smb.default
               name: samba-config
               subPath: smb.default
+          envFrom:
+            - configMapRef:
+                name: samba-config
       volumes:
-        - name: local-path
+        - name: share-path
           hostPath:
             path: /usr/local/data
             type: DirectoryOrCreate
-        - name: samba-config
-          configMap:
-            name: samba-config
diff --git a/clusters/kairos/samba-server/kustomization.yaml b/clusters/kairos/samba-server/kustomization.yaml
index f225ba3..8b3f664 100644
--- a/clusters/kairos/samba-server/kustomization.yaml
+++ b/clusters/kairos/samba-server/kustomization.yaml
@@ -4,4 +4,3 @@ namespace: kube-system
 resources:
   - configmap.yaml
   - deployment.yaml
-  - service.yaml
diff --git a/clusters/kairos/samba-server/service.yaml b/clusters/kairos/samba-server/service.yaml
deleted file mode 100644
index 5f28b90..0000000
--- a/clusters/kairos/samba-server/service.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-kind: Service
-apiVersion: v1
-metadata:
-  name: samba
-  namespace: kube-system
-  labels:
-    app: samba
-spec:
-  type: NodePort
-  selector:
-    app: samba
-  ports:
-    - port: 445
-      name: samba