diff --git a/clusters/kairos/samba-server/configmap.yaml b/clusters/kairos/samba-server/configmap.yaml
index 6bc66fa..63a0573 100644
--- a/clusters/kairos/samba-server/configmap.yaml
+++ b/clusters/kairos/samba-server/configmap.yaml
@@ -3,57 +3,17 @@ kind: ConfigMap
 metadata:
   name: samba-config
 data:
-  config.json: |
-    {
-      "samba-container-config": "v0",
-      "configs": {
-        "local": {
-          "shares": [
-            "share"
-          ],
-          "globals": [
-            "default"
-          ],
-          "instance_name": "SAMBA"
-        }
-      },
-      "shares": {
-        "share": {
-          "options": {
-            "path": "/share",
-            "valid users": "sambauser",
-            "writeable": "yes",
-            "guest ok": "yes",
-            "guest only": "yes"
-          }
-        }
-      },
-      "globals": {
-        "default": {
-          "options": {
-            "security": "user",
-            "server min protocol": "SMB2",
-            "load printers": "no",
-            "printing": "bsd",
-            "printcap name": "/dev/null",
-            "disable spoolss": "yes",
-            "guest ok": "yes",
-            "browsable": "yes",
-            "writable": "yes",
-            "guest account": "sambauser",
-            "create mask": "0775",
-            "directory mask": "0755",
-            "map to guest": "bad user"
-          }
-        }
-      },
-      "users": {
-        "all_entries": [
-          {
-            "name": "sambauser",
-            "password": "samba"
-          }
-        ]
-      },
-      "_footer": 1
-    }
+  FAIL_FAST: "true"
+  SAMBA_CONF_LOG_LEVEL: "2"
+  ACCOUNT_samba: samba
+  GROUPS_samba: samba
+  SAMBA_GLOBAL_STANZA: "map to guest = Bad User;guest account = samba;wins support = yes;load printers = no;"
+  SAMBA_VOLUME_CONFIG_share: |
+    [share]
+      path = /shares/data
+      comment = K3s share data
+      browseable = yes
+      writable = yes
+      read only = no
+      printable = no
+      public = yes
diff --git a/clusters/kairos/samba-server/deployment.yaml b/clusters/kairos/samba-server/deployment.yaml
index 562d002..5db777b 100644
--- a/clusters/kairos/samba-server/deployment.yaml
+++ b/clusters/kairos/samba-server/deployment.yaml
@@ -18,15 +18,9 @@ spec:
     spec:
       containers:
         - name: samba
-          image: quay.io/samba.org/samba-server:latest
+          image: ghcr.io/servercontainers/samba:a3.22.0-s4.21.4-r4
           ports:
             - containerPort: 445
-              hostPort: 445
-          env:
-            - name: SAMBACC_CONFIG
-              value: /etc/samba-container/config.json
-            - name: SAMBA_CONTAINER_ID
-              value: local
           resources:
             limits:
               cpu: 1000m
@@ -35,20 +29,19 @@ spec:
               cpu: 10m
               memory: 64Mi
           volumeMounts:
-            - mountPath: /share
-              name: local-path
-            - mountPath: /etc/samba-container
-              name: samba-config
+            - mountPath: /shares/data
+              name: share-path
+          envFrom:
+            - configMapRef:
+                name: samba-config
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet
       securityContext:
         privileged: true
         capabilities:
           add: ["NET_ADMIN"]
-      hostNetwork: true
-      dnsPolicy: ClusterFirstWithHostNet
       volumes:
-        - name: local-path
+        - name: share-path
           hostPath:
             path: /usr/local/data
-        - name: samba-config
-          configMap:
-            name: samba-config
+            type: DirectoryOrCreate