diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
index 9e1df02..358a1f3 100755
--- a/scripts/entrypoint.sh
+++ b/scripts/entrypoint.sh
@@ -3,6 +3,8 @@ set -x
 
 term_handler() {
   eval $USER_COMMAND_EXIT
+  eval $SYS_COMMAND_EXIT
+
   exit 143; # 128 + 15 -- SIGTERM
 }
 
@@ -14,6 +16,7 @@ sudo mkhomedir_helper `whoami`
 
 touch $LOG_FILE
 
+eval $SYS_COMMAND_INIT &
 eval $USER_COMMAND_INIT &
 
 tail -f $LOG_FILE & wait ${!}