diff --git a/bin/lamassu-update b/bin/lamassu-update
index 4e590311..1f8dd652 100755
--- a/bin/lamassu-update
+++ b/bin/lamassu-update
@@ -62,6 +62,8 @@ perl -i -pe 's/command=.*/command=$ENV{NPM_BIN}\/lamassu-admin-server/g' /etc/su
 decho "updating lamassu-server"
 supervisorctl update lamassu-server >> ${LOG_FILE} 2>&1
 supervisorctl update lamassu-admin-server >> ${LOG_FILE} 2>&1
+supervisorctl start lamassu-server >> ${LOG_FILE} 2>&1
+supervisorctl start lamassu-admin-server >> ${LOG_FILE} 2>&1
 
 decho "updating backups conf"
 BACKUP_CMD=${NPM_BIN}/lamassu-backup-pg
diff --git a/lib/app.js b/lib/app.js
index ba4ea3a5..a5661ebf 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -27,18 +27,22 @@ function run () {
     logger.error('[%d] Retrying in 10s...', count)
   }
 
-  const runner = () => runOnce()
-    .then(() => clearInterval(handler))
-    .catch(errorHandler)
+  const runner = () =>
+    settingsLoader.loadLatest()
+      .then(settings => {
+        clearInterval(handler)
+        return loadSanctions(settings)
+          .then(() => startServer(settings))
+      })
+      .catch(errorHandler)
 
-  return loadSanctions()
-    .then(() => { handler = setInterval(runner, 10000) })
-    .then(runner)
+  handler = setInterval(runner, 10000)
+  return runner()
 }
 
-function loadSanctions () {
-  return settingsLoader.loadLatest()
-    .then(settings => {
+function loadSanctions (settings) {
+  return Promise.resolve()
+    .then(() => {
       const config = configManager.unscoped(settings.config)
 
       if (!config.sanctionsVerificationActive) return
@@ -51,9 +55,9 @@ function loadSanctions () {
     })
 }
 
-function runOnce () {
-  return settingsLoader.loadLatest()
-    .then(settings => {
+function startServer (settings) {
+  return Promise.resolve()
+    .then(() => {
       poller.start(settings)
 
       const httpsServerOptions = {
@@ -74,12 +78,12 @@ function runOnce () {
       if (options.devMode) logger.info('In dev mode')
 
       server.listen(port, () => {
-        console.log('lamassu-server listening on port ' +
+        logger.info('lamassu-server listening on port ' +
         port + ' ' + (devMode ? '(http)' : '(https)'))
       })
 
       localServer.listen(localPort, 'localhost', () => {
-        console.log('lamassu-server listening on local port ' + localPort)
+        logger.info('lamassu-server listening on local port ' + localPort)
       })
     })
 }