diff --git a/conf/systemd.service b/conf/systemd.service
index 6925720..10ab4d7 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -4,9 +4,41 @@ After=network-online.target
 
 [Service]
 Type=simple
-User=homeassistant
+User=__APP__
 WorkingDirectory=__PATH__
-ExecStart=/opt/yunohost/homeassistant/bin/hass --config "__PATH__" --verbose
+ExecStart=/opt/yunohost/__APP__/bin/hass --config "__PATH__" --verbose
+StandardOutput=append:/var/log/__APP__.log
+StandardError=inherit
+
+# Sandboxing options to harden security
+# Depending on specificities of your service/app, you may need to tweak these 
+# .. but this should be a good baseline
+# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
+NoNewPrivileges=yes
+PrivateTmp=yes
+#CANT BE ACTIVATED FOR __APP__ #PrivateDevices=yes
+#CANT BE ACTIVATED FOR __APP__ #RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
+RestrictNamespaces=yes
+RestrictRealtime=yes
+DevicePolicy=closed
+ProtectSystem=full
+ProtectControlGroups=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+LockPersonality=yes
+SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap
+
+# Denying access to capabilities that should not be relevant for webapps
+# Doc: https://man7.org/linux/man-pages/man7/capabilities.7.html
+CapabilityBoundingSet=~CAP_RAWIO CAP_MKNOD
+CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE
+CapabilityBoundingSet=~CAP_SYS_BOOT CAP_SYS_TIME CAP_SYS_MODULE CAP_SYS_PACCT
+CapabilityBoundingSet=~CAP_LEASE CAP_LINUX_IMMUTABLE CAP_IPC_LOCK
+CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM
+CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG
+CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE
+CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
+CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG 
 
 [Install]
 WantedBy=multi-user.target 
diff --git a/scripts/remove b/scripts/remove
index b74d929..bbd487b 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,6 +1,6 @@
 #!/bin/bash
 # to test the functionnality :
-# yunohost app remove homeassistant
+# yunohost app remove homeassistant --purge
 
 source _common.sh
 source /usr/share/yunohost/helpers
@@ -36,7 +36,7 @@ ynh_remove_app_dependencies
 ynh_script_progression --message="Removing app main directory..."
 ynh_secure_remove --file="$final_path"
 
-# remove a directory securelyif --purge option is used
+# remove a directory securely if --purge option is used
 if [ "${YNH_APP_PURGE:-0}" -eq 1 ] ; then
 	ynh_script_progression --message="Removing app data directory..."
 	ynh_secure_remove --file="$data_path"
diff --git a/scripts/restore b/scripts/restore
index 8913324..25b0d3f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -1,8 +1,9 @@
 #!/bin/bash
 # to test the functionnality :
 # yunohost backup create -n "homeassistant-test" --apps homeassistant
-# yunohost app remove homeassistant
+# yunohost app remove homeassistant --purge
 # yunohost backup restore "homeassistant-test"
+# yunohost backup delete "homeassistant-test"
 
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
@@ -69,6 +70,7 @@ ynh_replace_string --match_string=" --verbose" --replace_string="" --target_file
 ynh_store_file_checksum --file="/etc/systemd/system/$app@$app.service"
 systemctl daemon-reload
 ynh_systemd_action --service_name="$app@$app" --action=restart
+sleep 60s
 
 # restore logrotate
 ynh_script_progression --message="Restoring logrotate..."