diff --git a/package.json b/package.json
index 8cfea3831..10f1d9b78 100644
--- a/package.json
+++ b/package.json
@@ -92,9 +92,9 @@
     "yargs": "^3.15.0"
   },
   "scripts": {
-    "migrate_local": "NODE_ENV=local DATABASE_URL=mysql://root:@localhost/box node_modules/.bin/db-migrate up",
-    "migrate_test": "NODE_ENV=test DATABASE_URL=mysql://root:@localhost/boxtest node_modules/.bin/db-migrate up",
-    "test": "npm run migrate_test && src/test/setupTest && NODE_ENV=test ./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- -R spec ./src/test ./src/routes/test",
+    "migrate_local": "DATABASE_URL=mysql://root:@localhost/box node_modules/.bin/db-migrate up",
+    "migrate_test": "BOX_ENV=test DATABASE_URL=mysql://root:@localhost/boxtest node_modules/.bin/db-migrate up",
+    "test": "npm run migrate_test && src/test/setupTest && BOX_ENV=test ./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- -R spec ./src/test ./src/routes/test",
     "postmerge": "/bin/true",
     "precommit": "/bin/true",
     "prepush": "npm test",
diff --git a/setup/container/sudoers b/setup/container/sudoers
index b8e7a3656..e2ce8f7b3 100644
--- a/setup/container/sudoers
+++ b/setup/container/sudoers
@@ -1,26 +1,26 @@
-Defaults!/home/yellowtent/box/src/scripts/createappdir.sh env_keep="HOME NODE_ENV"
+Defaults!/home/yellowtent/box/src/scripts/createappdir.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/createappdir.sh
 
-Defaults!/home/yellowtent/box/src/scripts/rmappdir.sh env_keep="HOME NODE_ENV"
+Defaults!/home/yellowtent/box/src/scripts/rmappdir.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/rmappdir.sh
 
-Defaults!/home/yellowtent/box/src/scripts/reloadnginx.sh env_keep="HOME NODE_ENV"
+Defaults!/home/yellowtent/box/src/scripts/reloadnginx.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/reloadnginx.sh
 
-Defaults!/home/yellowtent/box/src/scripts/backupbox.sh env_keep="HOME NODE_ENV"
+Defaults!/home/yellowtent/box/src/scripts/backupbox.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/backupbox.sh
 
-Defaults!/home/yellowtent/box/src/scripts/backupapp.sh env_keep="HOME NODE_ENV"
+Defaults!/home/yellowtent/box/src/scripts/backupapp.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/backupapp.sh
 
-Defaults!/home/yellowtent/box/src/scripts/restoreapp.sh env_keep="HOME NODE_ENV"
+Defaults!/home/yellowtent/box/src/scripts/restoreapp.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/restoreapp.sh
 
-Defaults!/home/yellowtent/box/src/scripts/reboot.sh env_keep="HOME NODE_ENV"
+Defaults!/home/yellowtent/box/src/scripts/reboot.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/reboot.sh
 
-Defaults!/home/yellowtent/box/src/scripts/reloadcollectd.sh env_keep="HOME NODE_ENV"
+Defaults!/home/yellowtent/box/src/scripts/reloadcollectd.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/reloadcollectd.sh
 
-Defaults!/home/yellowtent/box/src/scripts/backupswap.sh env_keep="HOME NODE_ENV"
+Defaults!/home/yellowtent/box/src/scripts/backupswap.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/backupswap.sh
diff --git a/setup/container/supervisor/conf.d/apphealthtask.conf b/setup/container/supervisor/conf.d/apphealthtask.conf
index 0c806536f..b0ef423fc 100644
--- a/setup/container/supervisor/conf.d/apphealthtask.conf
+++ b/setup/container/supervisor/conf.d/apphealthtask.conf
@@ -7,4 +7,4 @@ stdout_logfile=/var/log/supervisor/apphealthtask.log
 stdout_logfile_maxbytes=50MB
 stdout_logfile_backups=2
 user=yellowtent
-environment=HOME="/home/yellowtent",USER="yellowtent",DEBUG="box*",NODE_ENV="cloudron"
+environment=HOME="/home/yellowtent",USER="yellowtent",DEBUG="box*",BOX_ENV="cloudron",NODE_ENV="production"
diff --git a/setup/container/supervisor/conf.d/box.conf b/setup/container/supervisor/conf.d/box.conf
index 2354bdd0a..8be98dcb2 100644
--- a/setup/container/supervisor/conf.d/box.conf
+++ b/setup/container/supervisor/conf.d/box.conf
@@ -7,4 +7,4 @@ stdout_logfile=/var/log/supervisor/box.log
 stdout_logfile_maxbytes=50MB
 stdout_logfile_backups=2
 user=yellowtent
-environment=HOME="/home/yellowtent",USER="yellowtent",DEBUG="box*,connect-lastmile",NODE_ENV="cloudron"
+environment=HOME="/home/yellowtent",USER="yellowtent",DEBUG="box*,connect-lastmile",BOX_ENV="cloudron",NODE_ENV="production"
diff --git a/setup/container/supervisor/conf.d/crashnotifier.conf b/setup/container/supervisor/conf.d/crashnotifier.conf
index c6d56d4df..a732836b3 100644
--- a/setup/container/supervisor/conf.d/crashnotifier.conf
+++ b/setup/container/supervisor/conf.d/crashnotifier.conf
@@ -8,4 +8,4 @@ stderr_logfile=/var/log/supervisor/crashnotifier.log
 stderr_logfile_maxbytes=50MB
 stderr_logfile_backups=2
 user=yellowtent
-environment=HOME="/home/yellowtent",USER="yellowtent",NODE_ENV="cloudron"
+environment=HOME="/home/yellowtent",USER="yellowtent",BOX_ENV="cloudron",NODE_ENV="production"
diff --git a/setup/container/supervisor/conf.d/janitor.conf b/setup/container/supervisor/conf.d/janitor.conf
index 48681c609..c087c2765 100644
--- a/setup/container/supervisor/conf.d/janitor.conf
+++ b/setup/container/supervisor/conf.d/janitor.conf
@@ -7,4 +7,4 @@ stdout_logfile=/var/log/supervisor/janitor.log
 stdout_logfile_maxbytes=50MB
 stdout_logfile_backups=2
 user=yellowtent
-environment=HOME="/home/yellowtent",USER="yellowtent",DEBUG="box*",NODE_ENV="cloudron"
+environment=HOME="/home/yellowtent",USER="yellowtent",DEBUG="box*",BOX_ENV="cloudron",NODE_ENV="production"
diff --git a/setup/container/supervisor/conf.d/oauthproxy.conf b/setup/container/supervisor/conf.d/oauthproxy.conf
index 26782d2ba..99de95fb4 100644
--- a/setup/container/supervisor/conf.d/oauthproxy.conf
+++ b/setup/container/supervisor/conf.d/oauthproxy.conf
@@ -7,4 +7,4 @@ stdout_logfile=/var/log/supervisor/oauthproxy.log
 stdout_logfile_maxbytes=50MB
 stdout_logfile_backups=2
 user=yellowtent
-environment=HOME="/home/yellowtent",USER="yellowtent",DEBUG="box*",NODE_ENV="cloudron"
+environment=HOME="/home/yellowtent",USER="yellowtent",DEBUG="box*",BOX_ENV="cloudron",NODE_ENV="production"
diff --git a/setup/start.sh b/setup/start.sh
index 9407bba20..175381bcc 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -77,7 +77,7 @@ set_progress "25" "Migrating data"
 sudo -u "${USER}" -H bash <<EOF
 set -eu
 cd "${BOX_SRC_DIR}"
-NODE_ENV=cloudron DATABASE_URL=mysql://root:${mysql_root_password}@localhost/box "${BOX_SRC_DIR}/node_modules/.bin/db-migrate" up
+BOX_ENV=cloudron DATABASE_URL=mysql://root:${mysql_root_password}@localhost/box "${BOX_SRC_DIR}/node_modules/.bin/db-migrate" up
 EOF
 
 set_progress "28" "Setup collectd"
diff --git a/src/cloudron.js b/src/cloudron.js
index 65a2d492b..aa138787e 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -108,7 +108,7 @@ CloudronError.NOT_FOUND = 'Not found';
 function initialize(callback) {
     assert.strictEqual(typeof callback, 'function');
 
-    if (process.env.NODE_ENV !== 'test') {
+    if (process.env.BOX_ENV !== 'test') {
         addMailDnsRecords();
     }
 
diff --git a/src/config.js b/src/config.js
index 90e2e72a5..f9a2b9f44 100644
--- a/src/config.js
+++ b/src/config.js
@@ -11,8 +11,8 @@ exports = module.exports = {
     set: set,
 
     // ifdefs to check environment
-    CLOUDRON: process.env.NODE_ENV === 'cloudron',
-    TEST: process.env.NODE_ENV === 'test',
+    CLOUDRON: process.env.BOX_ENV === 'cloudron',
+    TEST: process.env.BOX_ENV === 'test',
 
     // convenience getters
     apiServerOrigin: apiServerOrigin,
diff --git a/src/docker.js b/src/docker.js
index c0ccbbca7..d30de90d0 100644
--- a/src/docker.js
+++ b/src/docker.js
@@ -10,7 +10,7 @@ exports = module.exports = (function () {
     var docker;
     var options = connectOptions(); // the real docker
 
-    if (process.env.NODE_ENV === 'test') {
+    if (process.env.BOX_ENV === 'test') {
         // test code runs a docker proxy on this port
         docker = new Docker({ host: 'http://localhost', port: 5687 });
     } else {
diff --git a/src/routes/apps.js b/src/routes/apps.js
index e99550daa..3d85901e1 100644
--- a/src/routes/apps.js
+++ b/src/routes/apps.js
@@ -117,7 +117,7 @@ function installApp(req, res, next) {
     if ('icon' in data && typeof data.icon !== 'string') return next(new HttpError(400, 'icon is not a string'));
 
     // allow tests to provide an appId for testing
-    var appId = (process.env.NODE_ENV === 'test' && typeof data.appId === 'string') ? data.appId : uuid.v4();
+    var appId = (process.env.BOX_ENV === 'test' && typeof data.appId === 'string') ? data.appId : uuid.v4();
 
     debug('Installing app id:%s storeid:%s loc:%s port:%j restrict:%s manifest:%j', appId, data.appStoreId, data.location, data.portBindings, data.accessRestriction, data.manifest);
 
diff --git a/src/scripts/createappdir.sh b/src/scripts/createappdir.sh
index 2d9c87f04..a94b57f26 100755
--- a/src/scripts/createappdir.sh
+++ b/src/scripts/createappdir.sh
@@ -17,7 +17,7 @@ if [[ "$1" == "--check" ]]; then
     exit 0
 fi
 
-if [[ "${NODE_ENV}" == "cloudron" ]]; then
+if [[ "${BOX_ENV}" == "cloudron" ]]; then
     readonly app_data_dir="${HOME}/data/$1"
     btrfs subvolume create "${app_data_dir}"
     mkdir -p "${app_data_dir}/data"
diff --git a/src/scripts/reboot.sh b/src/scripts/reboot.sh
index 580eb5907..0a236ee1a 100755
--- a/src/scripts/reboot.sh
+++ b/src/scripts/reboot.sh
@@ -12,7 +12,7 @@ if [[ $# == 1 && "$1" == "--check" ]]; then
     exit 0
 fi
 
-if [[ "${NODE_ENV}" == "cloudron" ]]; then
+if [[ "${BOX_ENV}" == "cloudron" ]]; then
     shutdown -r now
 fi
 
diff --git a/src/scripts/reloadcollectd.sh b/src/scripts/reloadcollectd.sh
index 0fbd1055b..ae0b5e63f 100755
--- a/src/scripts/reloadcollectd.sh
+++ b/src/scripts/reloadcollectd.sh
@@ -12,7 +12,7 @@ if [[ $# == 1 && "$1" == "--check" ]]; then
     exit 0
 fi
 
-if [[ "${NODE_ENV}" == "cloudron" ]]; then
+if [[ "${BOX_ENV}" == "cloudron" ]]; then
     /etc/init.d/collectd restart
 fi
 
diff --git a/src/scripts/reloadnginx.sh b/src/scripts/reloadnginx.sh
index 57d1f90e8..a10cf0127 100755
--- a/src/scripts/reloadnginx.sh
+++ b/src/scripts/reloadnginx.sh
@@ -17,7 +17,7 @@ if [[ "${OSTYPE}" == "darwin"* ]]; then
     export PATH=$PATH:/usr/local/bin
 fi
 
-if [[ "${NODE_ENV}" == "cloudron" ]]; then
+if [[ "${BOX_ENV}" == "cloudron" ]]; then
     nginx -s reload
 fi
 
diff --git a/src/scripts/rmappdir.sh b/src/scripts/rmappdir.sh
index ab04e2df5..f160cc54a 100755
--- a/src/scripts/rmappdir.sh
+++ b/src/scripts/rmappdir.sh
@@ -17,7 +17,7 @@ if [[ "$1" == "--check" ]]; then
     exit 0
 fi
 
-if [[ "${NODE_ENV}" == "cloudron" ]]; then
+if [[ "${BOX_ENV}" == "cloudron" ]]; then
     readonly app_data_dir="${HOME}/data/$1"
     if [[ -d "${app_data_dir}" ]]; then
         find "${app_data_dir}" -mindepth 1 -delete
diff --git a/src/server.js b/src/server.js
index 9d14b3f60..f5a483c3a 100644
--- a/src/server.js
+++ b/src/server.js
@@ -43,7 +43,7 @@ function initializeExpressSync() {
     app.set('view options', { layout: true, debug: true });
     app.set('view engine', 'ejs');
 
-    if (process.env.NODE_ENV === 'test') {
+    if (process.env.BOX_ENV === 'test') {
        app.use(express.static(path.join(__dirname, '/../webadmin')));
     } else {
         app.use(middleware.morgan('dev', { immediate: false }));
diff --git a/src/test/checkInstall b/src/test/checkInstall
index 76cdfe4af..c6f69dd33 100755
--- a/src/test/checkInstall
+++ b/src/test/checkInstall
@@ -24,7 +24,7 @@ for script in "${scripts[@]}"; do
         echo "${script} does not have sudo access."
         echo "You have to add the lines below to /etc/sudoers.d/yellowtent."
         echo ""
-        echo "Defaults!${script} env_keep=\"HOME NODE_ENV\""
+        echo "Defaults!${script} env_keep=\"HOME BOX_ENV\""
         echo "${USER} ALL=(ALL) NOPASSWD: ${script}"
         echo ""
         exit 1