diff --git a/monkey_island/deb-package/DEBIAN/postinst b/monkey_island/deb-package/DEBIAN/postinst
index 450c4cfdb..cd65ce8d9 100644
--- a/monkey_island/deb-package/DEBIAN/postinst
+++ b/monkey_island/deb-package/DEBIAN/postinst
@@ -12,5 +12,7 @@ rm -f $MONKEY_FOLDER/pip_requirements.txt
 
 mv $MONKEY_FOLDER/ubuntu/* /etc/init/
 
+./create_certificate.sh
+
 service monkey-island start
 service monkey-mongo start
diff --git a/monkey_island/linux/ubuntu/monkey-island.conf b/monkey_island/linux/ubuntu/monkey-island.conf
index 08c330d22..360559b31 100644
--- a/monkey_island/linux/ubuntu/monkey-island.conf
+++ b/monkey_island/linux/ubuntu/monkey-island.conf
@@ -13,6 +13,6 @@ end script
 
 post-stop script
     if [ -n $UPSTART_EVENTS ]; then
-        exec sleep 15
+        exec sleep 2
     fi
 end script
\ No newline at end of file
diff --git a/monkey_island/linux/ubuntu/monkey-mongo.conf b/monkey_island/linux/ubuntu/monkey-mongo.conf
index 71abbf27d..df9145014 100644
--- a/monkey_island/linux/ubuntu/monkey-mongo.conf
+++ b/monkey_island/linux/ubuntu/monkey-mongo.conf
@@ -13,6 +13,6 @@ end script
 
 post-stop script
     if [ -n $UPSTART_EVENTS ]; then
-        exec sleep 15
+        exec sleep 3
     fi
 end script
\ No newline at end of file