diff --git a/monkey_island/deb-package/DEBIAN/postinst b/monkey_island/deb-package/DEBIAN/postinst
index 372718b87..42b8f1eb0 100644
--- a/monkey_island/deb-package/DEBIAN/postinst
+++ b/monkey_island/deb-package/DEBIAN/postinst
@@ -22,8 +22,8 @@ if [ -d "/etc/systemd/network" ]; then
     cp ${MONKEY_FOLDER}/ubuntu/systemd/*.service /lib/systemd/system/
     chmod +x ${MONKEY_FOLDER}/ubuntu/systemd/start_server.sh
     systemctl daemon-reload
-	systemctl enable monkey-mongo
-	systemctl enable monkey-island
+    systemctl enable monkey-mongo
+    systemctl enable monkey-island
 fi
 
 ${MONKEY_FOLDER}/create_certificate.sh
diff --git a/monkey_island/linux/ubuntu/systemd/monkey-island.service b/monkey_island/linux/ubuntu/systemd/monkey-island.service
index fe43875ac..8868dc3aa 100644
--- a/monkey_island/linux/ubuntu/systemd/monkey-island.service
+++ b/monkey_island/linux/ubuntu/systemd/monkey-island.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Monkey Island Service
+Wants=monkey-mongo.service
 After=network.target
 
 [Service]