diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup
index 937b63097..03ac36eb2 100755
--- a/scripts/cloudron-setup
+++ b/scripts/cloudron-setup
@@ -159,7 +159,7 @@ if [[ "${initBaseImage}" == "true" ]]; then
     echo ""
 fi
 
-# NOTE: this install script only supports 4.2 and above
+# The provider flag is still used for marketplace images
 echo "=> Installing version ${version} (this takes some time) ..."
 mkdir -p /etc/cloudron
 echo "${provider}" > /etc/cloudron/PROVIDER
diff --git a/scripts/cloudron-support b/scripts/cloudron-support
index c119a8f1f..c0214d1f9 100755
--- a/scripts/cloudron-support
+++ b/scripts/cloudron-support
@@ -112,7 +112,7 @@ if [[ "${enableSSH}" == "true" ]]; then
     permit_root_login=$(grep -q ^PermitRootLogin.*yes /etc/ssh/sshd_config && echo "yes" || echo "no")
 
     # support.js uses similar logic
-    if $(grep -q "ec2\|lightsail\|ami" /etc/cloudron/PROVIDER); then
+    if [[ -d /home/ubuntu ]]; then
         ssh_user="ubuntu"
         keys_file="/home/ubuntu/.ssh/authorized_keys"
     else
diff --git a/src/appstore.js b/src/appstore.js
index 9fd9a1d59..0d19837e3 100644
--- a/src/appstore.js
+++ b/src/appstore.js
@@ -309,7 +309,6 @@ function sendAliveStatus(callback) {
         var data = {
             version: constants.VERSION,
             adminFqdn: settings.adminFqdn(),
-            provider: settings.provider(),
             backendSettings: backendSettings,
             machine: {
                 cpus: os.cpus(),
@@ -498,7 +497,7 @@ function registerWithLoginCredentials(options, callback) {
             login(options.email, options.password, options.totpToken || '', function (error, result) {
                 if (error) return callback(error);
 
-                registerCloudron({ domain: settings.adminDomain(), accessToken: result.accessToken, provider: settings.provider(), version: constants.VERSION, purpose: options.purpose || '' }, callback);
+                registerCloudron({ domain: settings.adminDomain(), accessToken: result.accessToken, version: constants.VERSION, purpose: options.purpose || '' }, callback);
             });
         });
     });
diff --git a/src/cloudron.js b/src/cloudron.js
index ccdf124ee..cc60bd031 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -139,7 +139,6 @@ function getConfig(callback) {
             mailFqdn: settings.mailFqdn(),
             version: constants.VERSION,
             isDemo: settings.isDemo(),
-            provider: settings.provider(),
             cloudronName: allSettings[settings.CLOUDRON_NAME_KEY],
             footer: allSettings[settings.FOOTER_KEY] || constants.FOOTER,
             features: appstore.getFeatures()
diff --git a/src/provision.js b/src/provision.js
index cefa9b74b..25001fb3a 100644
--- a/src/provision.js
+++ b/src/provision.js
@@ -226,7 +226,6 @@ function getStatus(callback) {
                 version: constants.VERSION,
                 apiServerOrigin: settings.apiServerOrigin(), // used by CaaS tool
                 webServerOrigin: settings.webServerOrigin(), // used by CaaS tool
-                provider: settings.provider(),
                 cloudronName: allSettings[settings.CLOUDRON_NAME_KEY],
                 footer: allSettings[settings.FOOTER_KEY] || constants.FOOTER,
                 adminFqdn: settings.adminDomain() ? settings.adminFqdn() : null,
diff --git a/src/support.js b/src/support.js
index b4c994ad0..00e04b71e 100644
--- a/src/support.js
+++ b/src/support.js
@@ -12,7 +12,7 @@ let assert = require('assert'),
     once = require('once'),
     path = require('path'),
     paths = require('./paths.js'),
-    settings = require('./settings.js'),
+    safe = require('safetydance'),
     shell = require('./shell.js');
 
 // the logic here is also used in the cloudron-support tool
@@ -24,7 +24,7 @@ function sshInfo() {
     if (constants.TEST) {
         filePath = path.join(paths.baseDir(), 'authorized_keys');
         user = process.getuid();
-    } else if (settings.provider() === 'ec2' || settings.provider() === 'lightsail' || settings.provider() === 'ami') {
+    } else if (safe.fs.existsSync('/home/ubuntu')) { // yellowtent user won't have access to anything deeper
         filePath = '/home/ubuntu/.ssh/authorized_keys';
         user = 'ubuntu';
     } else {