diff --git a/activemq.sh b/activemq.sh
index 7b7e501..837ffd9 100755
--- a/activemq.sh
+++ b/activemq.sh
@@ -11,5 +11,5 @@ chown -R 61616:61616 /srv/activemq/data
 
 # Configure Solr service
 cp ${SOURCE_DIR}/etc/init.d/activemq /etc/init.d/activemq
-rc-update add activemq boot
+rc-update add activemq
 service activemq start
diff --git a/basic.sh b/basic.sh
index a61318f..113eae3 100755
--- a/basic.sh
+++ b/basic.sh
@@ -20,7 +20,6 @@ cp ${SOURCE_DIR}/etc/inittab /etc/inittab
 # Enable support for Czech characters
 cp ${SOURCE_DIR}/etc/rc.conf /etc/rc.conf
 cp ${SOURCE_DIR}/etc/conf.d/consolefont /etc/conf.d/consolefont
-rc-update add consolefont boot
 
 # Set legal banner with URL
 cp ${SOURCE_DIR}/etc/issue.template /etc/issue.template
@@ -29,7 +28,6 @@ cp ${SOURCE_DIR}/sbin/issue-gen /sbin/issue-gen
 
 # Configure NTP client
 cp ${SOURCE_DIR}/etc/conf.d/ntpd /etc/conf.d/ntpd
-rc-update add ntpd boot
 
 # Create a self-signed certificate
 mkdir /etc/ssl/private
@@ -46,7 +44,7 @@ cp ${SOURCE_DIR}/usr/local/bin/portal-app-manager /usr/local/bin/portal-app-mana
 cp -r ${SOURCE_DIR}/srv/portal /srv/portal
 
 # Configure services
-for SERVICE in crond docker nginx sshd; do
+for SERVICE in consolefont crond docker nginx ntpd sshd; do
     rc-update add ${SERVICE} boot
     service ${SERVICE} start
 done
diff --git a/ckan-datapusher.sh b/ckan-datapusher.sh
index b3193a8..817c56d 100755
--- a/ckan-datapusher.sh
+++ b/ckan-datapusher.sh
@@ -13,5 +13,5 @@ chown -R 8004:8004 /srv/ckan-datapusher/data
 
 # Configure CKAN DataPusher service
 cp ${SOURCE_DIR}/etc/init.d/ckan-datapusher /etc/init.d/ckan-datapusher
-rc-update add ckan-datapusher boot
+rc-update add ckan-datapusher
 service ckan-datapusher start
diff --git a/ckan.sh b/ckan.sh
index ad87a9a..f3648e2 100755
--- a/ckan.sh
+++ b/ckan.sh
@@ -55,7 +55,7 @@ envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql ckan
 
 # Configure CKAN service
 cp ${SOURCE_DIR}/etc/init.d/ckan /etc/init.d/ckan
-rc-update add ckan boot
+rc-update add ckan
 service ckan start
 
 # Create nginx app definition
diff --git a/crisiscleanup.sh b/crisiscleanup.sh
index d971c0f..155caa6 100755
--- a/crisiscleanup.sh
+++ b/crisiscleanup.sh
@@ -36,7 +36,7 @@ rm /tmp/seeds.rb
 
 # Create CrisisCleanup service
 cp ${SOURCE_DIR}/etc/init.d/crisiscleanup /etc/init.d/crisiscleanup
-rc-update add crisiscleanup boot
+rc-update add crisiscleanup
 service crisiscleanup start
 
 # Create nginx app definition
diff --git a/cts.sh b/cts.sh
index 612d9ca..38f0b2f 100755
--- a/cts.sh
+++ b/cts.sh
@@ -38,7 +38,7 @@ envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql cts
 
 # Create CTS service
 cp ${SOURCE_DIR}/etc/init.d/cts /etc/init.d/cts
-rc-update add cts boot
+rc-update add cts
 service cts start
 
 # Create nginx app definition
diff --git a/gnuhealth.sh b/gnuhealth.sh
index 28fd356..d9f0c8d 100755
--- a/gnuhealth.sh
+++ b/gnuhealth.sh
@@ -30,7 +30,7 @@ rm -f /tmp/gnuhealth_demo.sql.gz
 
 # Create GNU Health service
 cp ${SOURCE_DIR}/etc/init.d/gnuhealth /etc/init.d/gnuhealth
-rc-update add gnuhealth boot
+rc-update add gnuhealth
 service gnuhealth start
 
 # Create nginx app definition
diff --git a/kanboard.sh b/kanboard.sh
index c60f8f9..e6bab9f 100755
--- a/kanboard.sh
+++ b/kanboard.sh
@@ -25,7 +25,7 @@ envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql kanboard
 
 # Create KanBoard service
 cp ${SOURCE_DIR}/etc/init.d/kanboard /etc/init.d/kanboard
-rc-update add kanboard boot
+rc-update add kanboard
 service kanboard start
 
 # Create nginx app definition
diff --git a/mariadb.sh b/mariadb.sh
index 9176294..9e46bce 100755
--- a/mariadb.sh
+++ b/mariadb.sh
@@ -20,7 +20,7 @@ fi
 
 # Configure MariaDB service
 cp ${SOURCE_DIR}/etc/init.d/mariadb /etc/init.d/mariadb
-rc-update add mariadb boot
+rc-update add mariadb
 service mariadb start
 
 # Configure MariaDB admin
diff --git a/mifosx.sh b/mifosx.sh
index ce3d169..37e93ab 100755
--- a/mifosx.sh
+++ b/mifosx.sh
@@ -24,7 +24,7 @@ envsubst <${SOURCE_DIR}/srv/mifosx/conf/context.xml >/srv/mifosx/conf/context.xm
 
 # Create Mifos X service
 cp ${SOURCE_DIR}/etc/init.d/mifosx /etc/init.d/mifosx
-rc-update add mifosx boot
+rc-update add mifosx
 service mifosx start
 
 # Update admin account
diff --git a/motech.sh b/motech.sh
index 2a29ecb..5d53261 100755
--- a/motech.sh
+++ b/motech.sh
@@ -27,7 +27,7 @@ cp ${SOURCE_DIR}/srv/motech/update-ip.sh /srv/motech/update-ip.sh
 
 # Create Motech service
 cp ${SOURCE_DIR}/etc/init.d/motech /etc/init.d/motech
-rc-update add motech boot
+rc-update add motech
 service motech start
 
 # Configure Motech admin
diff --git a/openmapkit.sh b/openmapkit.sh
index ee99023..c4a9402 100755
--- a/openmapkit.sh
+++ b/openmapkit.sh
@@ -14,7 +14,7 @@ envsubst <${SOURCE_DIR}/srv/openmapkit/conf/settings.js >/srv/openmapkit/conf/se
 
 # Configure OpenMapKit service
 cp ${SOURCE_DIR}/etc/init.d/openmapkit /etc/init.d/openmapkit
-rc-update add openmapkit boot
+rc-update add openmapkit
 service openmapkit start
 
 # Create nginx app definition
diff --git a/pandora.sh b/pandora.sh
index 23e4441..bb47b61 100755
--- a/pandora.sh
+++ b/pandora.sh
@@ -47,7 +47,7 @@ envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql pandora
 
 # Configure Pandora service
 cp ${SOURCE_DIR}/etc/init.d/pandora /etc/init.d/pandora
-rc-update add pandora boot
+rc-update add pandora
 service pandora start
 
 # Create nginx app definition
diff --git a/postfix.sh b/postfix.sh
index c800add..5e8d432 100755
--- a/postfix.sh
+++ b/postfix.sh
@@ -14,5 +14,5 @@ cp ${SOURCE_DIR}/srv/postfix/conf/main.cf /srv/postfix/conf/main.cf
 
 # Configure postfix service
 cp ${SOURCE_DIR}/etc/init.d/postfix /etc/init.d/postfix
-rc-update add postfix boot
+rc-update add postfix
 service postfix start
diff --git a/postgres.sh b/postgres.sh
index a860652..542352a 100755
--- a/postgres.sh
+++ b/postgres.sh
@@ -23,5 +23,5 @@ fi
 
 # Configure Postgres service
 cp ${SOURCE_DIR}/etc/init.d/postgres /etc/init.d/postgres
-rc-update add postgres boot
+rc-update add postgres
 service postgres start
diff --git a/rabbitmq.sh b/rabbitmq.sh
index 6b7f3cc..ca4e37f 100755
--- a/rabbitmq.sh
+++ b/rabbitmq.sh
@@ -11,5 +11,5 @@ chown 5672:5672 /srv/rabbitmq/data
 
 # Configure RabbitMQ service
 cp ${SOURCE_DIR}/etc/init.d/rabbitmq /etc/init.d/rabbitmq
-rc-update add rabbitmq boot
+rc-update add rabbitmq
 service rabbitmq start
diff --git a/redis.sh b/redis.sh
index cce1a0d..7d96ac5 100755
--- a/redis.sh
+++ b/redis.sh
@@ -12,5 +12,5 @@ chown -R 6379:6379 /srv/redis/data
 
 # Configure Redis service
 cp ${SOURCE_DIR}/etc/init.d/redis /etc/init.d/redis
-rc-update add redis boot
+rc-update add redis
 service redis start
diff --git a/sahana.sh b/sahana.sh
index dbcc362..c4e9097 100755
--- a/sahana.sh
+++ b/sahana.sh
@@ -43,7 +43,7 @@ fi
 
 # Create Sahana service
 cp ${SOURCE_DIR}/etc/init.d/sahana /etc/init.d/sahana
-rc-update add sahana boot
+rc-update add sahana
 service sahana start
 
 # Create nginx app definition
diff --git a/sambro.sh b/sambro.sh
index 58db888..6f9c74d 100755
--- a/sambro.sh
+++ b/sambro.sh
@@ -40,7 +40,7 @@ fi
 
 # Create SAMBRO service
 cp ${SOURCE_DIR}/etc/init.d/sambro /etc/init.d/sambro
-rc-update add sambro boot
+rc-update add sambro
 service sambro start
 
 # Create nginx app definition
diff --git a/seeddms.sh b/seeddms.sh
index ac97da2..71078f8 100755
--- a/seeddms.sh
+++ b/seeddms.sh
@@ -29,7 +29,7 @@ envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql seeddms
 
 # Create SeedDMS service
 cp ${SOURCE_DIR}/etc/init.d/seeddms /etc/init.d/seeddms
-rc-update add seeddms boot
+rc-update add seeddms
 service seeddms start
 
 # Create nginx app definition
diff --git a/sigmah.sh b/sigmah.sh
index d494162..8f70cfe 100755
--- a/sigmah.sh
+++ b/sigmah.sh
@@ -44,7 +44,7 @@ rm -f /tmp/sigmah-MinimumDataKit.sql /tmp/sigmah-newOrganizationLaunchScript.sql
 
 # Create Sigmah service
 cp ${SOURCE_DIR}/etc/init.d/sigmah /etc/init.d/sigmah
-rc-update add sigmah boot
+rc-update add sigmah
 service sigmah start
 
 # Create nginx app definition
diff --git a/solr.sh b/solr.sh
index b0ac356..c3b58f0 100755
--- a/solr.sh
+++ b/solr.sh
@@ -13,5 +13,5 @@ chown -R 8983:8983 /srv/solr/data
 
 # Configure Solr service
 cp ${SOURCE_DIR}/etc/init.d/solr /etc/init.d/solr
-rc-update add solr boot
+rc-update add solr
 service solr start
diff --git a/ushahidi.sh b/ushahidi.sh
index 15c2f89..7da0c34 100755
--- a/ushahidi.sh
+++ b/ushahidi.sh
@@ -30,7 +30,7 @@ envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i mariadb mysql ushahidi
 
 # Create Ushahidi service
 cp ${SOURCE_DIR}/etc/init.d/ushahidi /etc/init.d/ushahidi
-rc-update add ushahidi boot
+rc-update add ushahidi
 service ushahidi start
 
 # Create nginx app definition