diff --git a/monkey_island/deb-package/DEBIAN/prerm b/monkey_island/deb-package/DEBIAN/prerm
new file mode 100644
index 000000000..1fcb4754e
--- /dev/null
+++ b/monkey_island/deb-package/DEBIAN/prerm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+service monkey-island stop || true
+service monkey-mongo stop || true
+
+rm -f /etc/init/monkey-island.conf
+rm -f /etc/init/monkey-mongo.conf
diff --git a/monkey_island/linux/create_certificate.sh b/monkey_island/linux/create_certificate.sh
index cebfa0ae8..32fa9756d 100644
--- a/monkey_island/linux/create_certificate.sh
+++ b/monkey_island/linux/create_certificate.sh
@@ -2,5 +2,5 @@
 
 cd /var/monkey_island
 openssl genrsa -out cc/server.key 1024
-openssl req -new -key cc/server.key -out cc/server.csr -subj "/C=GB/ST=London/L=London/O=Global Security/OU=IT Department/CN=example.com"
+openssl req -new -key cc/server.key -out cc/server.csr -subj "/C=GB/ST=London/L=London/O=Global Security/OU=Monkey Department/CN=monkey.com"
 openssl x509 -req -days 366 -in cc/server.csr -signkey cc/server.key -out cc/server.crt