diff --git a/pkg.info b/pkg.info
index 8a493da..649ab16 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,7 +1,7 @@
 name: samba
 description: SMB Fileserver and AD Domain server
 version: 4.23.6
-revision: 1
+revision: 2
 url: https://archlinux.org/packages/extra/x86_64/samba/
 license: GPL3-or-later
 maintainers:
diff --git a/source-files/nmbd.esv b/source-files/nmbd.esv
new file mode 100644
index 0000000..cf5a647
--- /dev/null
+++ b/source-files/nmbd.esv
@@ -0,0 +1,5 @@
+name: nmbd
+description: Samba NMB Daemon
+type: background
+start_cmd: /bin/sh -c "install -d /run/samba && exec /usr/sbin/nmbd -F -d=1 --no-process-group"
+restart: true
diff --git a/source-files/samba.esv b/source-files/samba.esv
index 125f501..3b78f84 100644
--- a/source-files/samba.esv
+++ b/source-files/samba.esv
@@ -1,6 +1,5 @@
 name: samba
-description: Samba SMB Daemon
+description: Samba AD Daemon
 type: background
-start_cmd: /bin/sh -c "install -d /run/samba && exec /usr/sbin/nmbd -F -d=1 --no-process-group"
-exit_method: kill
+start_cmd: /bin/sh -c "install -d /run/samba && exec /usr/sbin/samba -F -d=1 --no-process-group"
 restart: true
diff --git a/source-files/smbd.esv b/source-files/smbd.esv
new file mode 100644
index 0000000..6cad091
--- /dev/null
+++ b/source-files/smbd.esv
@@ -0,0 +1,5 @@
+name: smbd
+description: Samba SMB Daemon
+type: background
+start_cmd: /bin/sh -c "install -d /run/samba && exec /usr/sbin/smbd -F -d=1 --no-process-group"
+restart: true
diff --git a/source-files/winbindd.esv b/source-files/winbindd.esv
new file mode 100644
index 0000000..53292ab
--- /dev/null
+++ b/source-files/winbindd.esv
@@ -0,0 +1,5 @@
+name: winbindd
+description: Samba Winbind Daemon
+type: background
+start_cmd: /bin/sh -c "install -d /run/samba && exec /usr/sbin/winbindd -F -d=1 --no-process-group"
+restart: true
diff --git a/source.sh b/source.sh
index 37f2d49..ff6376c 100644
--- a/source.sh
+++ b/source.sh
@@ -78,8 +78,8 @@ package_samba() {
   _pick smbclient usr/share/man/man7/libsmbclient.7
   _pick smbclient usr/share/man/man8/{smbspool,net}.8
 
-  # Install esvm service
-  install -Dm644 "$BPM_WORKDIR"/samba.esv "$BPM_OUTPUT"/etc/esvm/services/samba.esv
+  # Install esvm services
+  install -Dm644 "$BPM_WORKDIR"/*.esv -t "$BPM_OUTPUT"/etc/esvm/services
 
   # Install package license
   install -Dm644 "$BPM_SOURCE"/COPYING "$BPM_OUTPUT"/usr/share/licenses/samba/COPYING