diff --git a/bootstrap-debian.sh b/bootstrap-debian.sh
index 86ed9be..3577a73 100644
--- a/bootstrap-debian.sh
+++ b/bootstrap-debian.sh
@@ -256,7 +256,10 @@ initializeOnmsDb() {
 restartOnms() {
   printf 'START_TIMEOUT=0' > "${OPENNMS_HOME}/etc/opennms.conf"
   echo -n "Starting OpenNMS                      ... "
-  service opennms restart 1>/dev/null 2>>${ERROR_LOG}
+  systemctl start opennms 1>/dev/null 2>>${ERROR_LOG}
+  checkError ${?}
+  echo -n "OpenNMS systemd enable                ... "
+  systemctl enable opennms 1>/dev/null 2>>${ERROR_LOG}
   checkError ${?}
 }
 
diff --git a/bootstrap-yum.sh b/bootstrap-yum.sh
index c8ead82..b516e00 100644
--- a/bootstrap-yum.sh
+++ b/bootstrap-yum.sh
@@ -250,6 +250,7 @@ initializeOnmsDb() {
 }
 
 restartOnms() {
+  printf 'START_TIMEOUT=0' > "${OPENNMS_HOME}/etc/opennms.conf"
   echo -n "Starting OpenNMS                      ... "
   systemctl start opennms 1>/dev/null 2>>${ERROR_LOG}
   checkError ${?}