diff --git a/setup/container/sudoers b/setup/container/sudoers
index cb0a20e2c..e1d76bf26 100644
--- a/setup/container/sudoers
+++ b/setup/container/sudoers
@@ -31,3 +31,6 @@ yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/collectlogs.sh
 Defaults!/home/yellowtent/box/src/scripts/retire.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/retire.sh
 
+Defaults!/home/yellowtent/box/src/scripts/setup_infra.sh env_keep="HOME BOX_ENV"
+yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/setup_infra.sh
+
diff --git a/setup/start.sh b/setup/start.sh
index b30150f52..669633891 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -122,9 +122,6 @@ set_progress "33" "Changing ownership"
 chown "${USER}:${USER}" -R "${DATA_DIR}/box" "${DATA_DIR}/nginx" "${DATA_DIR}/collectd" "${DATA_DIR}/addons" "${DATA_DIR}/acme"
 chown "${USER}:${USER}" "${DATA_DIR}"
 
-set_progress "40" "Setting up infra"
-${script_dir}/start/setup_infra.sh "${arg_fqdn}"
-
 set_progress "65" "Creating cloudron.conf"
 sudo -u yellowtent -H bash <<EOF
 set -eu
diff --git a/setup/INFRA_VERSION b/src/INFRA_VERSION
similarity index 100%
rename from setup/INFRA_VERSION
rename to src/INFRA_VERSION
diff --git a/src/addons.js b/src/addons.js
index fe87e80d2..ed8383ffe 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -1,6 +1,8 @@
 'use strict';
 
 exports = module.exports = {
+    initialize: initialize,
+
     setupAddons: setupAddons,
     teardownAddons: teardownAddons,
     backupAddons: backupAddons,
@@ -109,7 +111,8 @@ var KNOWN_ADDONS = {
     }
 };
 
-var RMAPPDIR_CMD = path.join(__dirname, 'scripts/rmappdir.sh');
+var RMAPPDIR_CMD = path.join(__dirname, 'scripts/rmappdir.sh'),
+    SETUP_INFRA_CMD = path.join(__dirname, 'scripts/setup_infra.sh');;
 
 function debugApp(app, args) {
     assert(!app || typeof app === 'object');
@@ -118,6 +121,11 @@ function debugApp(app, args) {
     debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }
 
+function initialize(callback) {
+    debug('initializing addon infrastructure');
+    shell.sudo('seutp_infra', [ SETUP_INFRA_CMD ], callback);
+}
+
 function setupAddons(app, addons, callback) {
     assert.strictEqual(typeof app, 'object');
     assert(!addons || typeof addons === 'object');
@@ -653,7 +661,7 @@ function setupRedis(app, options, callback) {
         name: 'redis-' + app.id,
         Hostname: 'redis-' + app.location,
         Tty: true,
-        Image: 'cloudron/redis:0.8.0', // if you change this, fix setup/INFRA_VERSION as well
+        Image: 'cloudron/redis:0.8.0', // if you change this, fix src/INFRA_VERSION as well
         Cmd: null,
         Volumes: {
             '/tmp': {},
diff --git a/src/routes/test/start_addons.sh b/src/routes/test/start_addons.sh
index 3d0023d8d..e476df2fa 100755
--- a/src/routes/test/start_addons.sh
+++ b/src/routes/test/start_addons.sh
@@ -4,7 +4,7 @@ set -eu -o pipefail
 
 readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
 
-source ${SOURCE_DIR}/setup/INFRA_VERSION
+source ${SOURCE_DIR}/src/INFRA_VERSION
 
 readonly mysqldatadir="/tmp/mysqldata-$(date +%s)"
 readonly postgresqldatadir="/tmp/postgresqldata-$(date +%s)"
diff --git a/setup/start/setup_infra.sh b/src/scripts/setup_infra.sh
similarity index 100%
rename from setup/start/setup_infra.sh
rename to src/scripts/setup_infra.sh
diff --git a/src/server.js b/src/server.js
index e48921cff..6df3367f9 100644
--- a/src/server.js
+++ b/src/server.js
@@ -5,7 +5,8 @@ exports = module.exports = {
     stop: stop
 };
 
-var assert = require('assert'),
+var addons = require('./addons.js'),
+    assert = require('assert'),
     async = require('async'),
     auth = require('./auth.js'),
     certificates = require('./certificates.js'),
@@ -258,6 +259,7 @@ function start(callback) {
         database.initialize,
         cloudron.initialize, // keep this here because it reads activation state that others depend on
         certificates.installAdminCertificate, // keep this before cron to block heartbeats until cert is ready
+        addons.initialize,
         taskmanager.initialize,
         mailer.initialize,
         cron.initialize,
diff --git a/src/test/checkInstall b/src/test/checkInstall
index 3f757c0f6..03893d15b 100755
--- a/src/test/checkInstall
+++ b/src/test/checkInstall
@@ -5,7 +5,7 @@ set -eu
 readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
 readonly TEST_IMAGE="cloudron/test:10.0.0"
 
-source ${SOURCE_DIR}/setup/INFRA_VERSION
+source ${SOURCE_DIR}/src/INFRA_VERSION
 
 # reset sudo timestamp to avoid wrong success
 sudo -k || sudo --reset-timestamp
@@ -13,6 +13,7 @@ sudo -k || sudo --reset-timestamp
 # checks if all scripts are sudo access
 scripts=("${SOURCE_DIR}/src/scripts/rmappdir.sh" \
          "${SOURCE_DIR}/src/scripts/createappdir.sh" \
+         "${SOURCE_DIR}/src/scripts/setup_infra.sh" \
          "${SOURCE_DIR}/src/scripts/reloadnginx.sh" \
          "${SOURCE_DIR}/src/scripts/backupbox.sh" \
          "${SOURCE_DIR}/src/scripts/backupapp.sh" \