diff --git a/files/new_mail_alias b/files/new_mail_alias
index aadb444..10538c8 100644
--- a/files/new_mail_alias
+++ b/files/new_mail_alias
@@ -108,4 +108,4 @@ do
     fi
 done
 echo "INSERT INTO mail.forwardings (source, destination, porpouse) VALUES ('${alias}','${destination}','${porpouse}');"| mysql mail
-message "Inserted forwarding from '${alias}' to '${destination}' for the porpouse of '${porpouse}'." p
\ No newline at end of file
+message "Inserted forwarding from '${alias}' to '${destination}' for the porpouse of '${porpouse}'." p
diff --git a/files/saslauthd b/files/saslauthd
deleted file mode 100644
index c4446a8..0000000
--- a/files/saslauthd
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Settings for saslauthd daemon
-# Please read /usr/share/doc/sasl2-bin/README.Debian for details.
-#
-
-# Should saslauthd run automatically on startup? (default: no)
-START=yes
-
-# Description of this saslauthd instance. Recommended.
-# (suggestion: SASL Authentication Daemon)
-DESC="SASL Authentication Daemon"
-
-# Short name of this saslauthd instance. Strongly recommended.
-# (suggestion: saslauthd)
-NAME="saslauthd"
-
-# Which authentication mechanisms should saslauthd use? (default: pam)
-#
-# Available options in this Debian package:
-# getpwent  -- use the getpwent() library function
-# kerberos5 -- use Kerberos 5
-# pam       -- use PAM
-# rimap     -- use a remote IMAP server
-# shadow    -- use the local shadow password file
-# sasldb    -- use the local sasldb database file
-# ldap      -- use LDAP (configuration is in /etc/saslauthd.conf)
-#
-# Only one option may be used at a time. See the saslauthd man page
-# for more information.
-#
-# Example: MECHANISMS="pam"
-MECHANISMS="pam"
-#MECHANISMS="rimap"
-
-# Additional options for this mechanism. (default: none)
-# See the saslauthd man page for information about mech-specific options.
-MECH_OPTIONS=""
-
-# How many saslauthd processes should we run? (default: 5)
-# A value of 0 will fork a new process for each connection.
-THREADS=5
-
-# Other options (default: -c -m /var/run/saslauthd)
-# Note: You MUST specify the -m option or saslauthd won't run!
-#
-# WARNING: DO NOT SPECIFY THE -d OPTION.
-# The -d option will cause saslauthd to run in the foreground instead of as
-# a daemon. This will PREVENT YOUR SYSTEM FROM BOOTING PROPERLY. If you wish
-# to run saslauthd in debug mode, please run it by hand to be safe.
-#
-# See /usr/share/doc/sasl2-bin/README.Debian for Debian-specific information.
-# See the saslauthd man page and the output of 'saslauthd -h' for general
-# information about these options.
-#
-# Example for chroot Postfix users: "-c -m /var/spool/postfix/var/run/saslauthd"
-# Example for non-chroot Postfix users: "-c -m /var/run/saslauthd"
-#
-# To know if your Postfix is running chroot, check /etc/postfix/master.cf.
-# If it has the line "smtp inet n - y - - smtpd" or "smtp inet n - - - - smtpd"
-# then your Postfix is running in a chroot.
-# If it has the line "smtp inet n - n - - smtpd" then your Postfix is NOT
-# running in a chroot.
-#OPTIONS="-c -m /var/run/saslauthd"
-#OPTIONS="-c -m /var/spool/postfix/var/run/saslauthd -r"
-#OPTIONS="-c -m /var/spool/postfix/var/run/courier/authdaemon -r -d"
-OPTIONS="-r -c -m /var/spool/postfix/var/run/saslauthd"
diff --git a/templates/service.unit.j2 b/templates/service.unit.j2
new file mode 100644
index 0000000..a6dd5f7
--- /dev/null
+++ b/templates/service.unit.j2
@@ -0,0 +1,21 @@
+[Unit]
+Description={{ unit_description }}
+After=network.target network-online.target mysqld.service postgresql.service
+
+[Service]
+Type=notify
+{% if unit_exec_start_pre is defined %}{% for pre_exec in unit_exec_start_pre %}
+ExecStartPre={{ pre_exec }}
+ExecStart={{ unit_exec_start }}
+{% if unit_restart_policy is defined %}
+Restart={{ unit_restart_policy }}
+{% endif %}
+{% if unit_restart_secs is defined %}
+RestartSec={{ unit_restart_secs }}
+{% endif %}
+{% if unit_timeout_start_sec is defined %}
+TimeoutStartSec = {{ unit_timeout_start_sec }}
+{% endif %}
+
+[Install]
+WantedBy=multi-user.target