diff --git a/setup/argparser.sh b/setup/argparser.sh
index f2ba3b664..7ae2af4be 100644
--- a/setup/argparser.sh
+++ b/setup/argparser.sh
@@ -16,6 +16,7 @@ arg_tls_key=""
 arg_token=""
 arg_version=""
 arg_web_server_origin=""
+arg_aws=""
 
 args=$(getopt -o "" -l "data:,retire" -n "$0" -- "$@")
 eval set -- "${args}"
@@ -41,6 +42,9 @@ EOF
         arg_restore_key=$(echo "$2" | $json restoreKey)
         [[ "${arg_restore_key}" == "null" ]] && arg_restore_key=""
 
+        arg_aws=$(echo "$2" | $json aws)
+        [[ "${arg_aws}" == "null" ]] && arg_aws=""
+
         shift 2
         ;;
     --) break;;
diff --git a/setup/start.sh b/setup/start.sh
index dce481314..cd32dc8ae 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -138,7 +138,8 @@ cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
         "password": "${mysql_root_password}",
         "port": 3306,
         "name": "box"
-    }
+    },
+    "aws": ${arg_aws}
 }
 CONF_END
 
diff --git a/src/config.js b/src/config.js
index 8a9762519..6c067ac0e 100644
--- a/src/config.js
+++ b/src/config.js
@@ -75,10 +75,10 @@ function initConfig() {
     data.ldapPort = 3002;
     data.backupKey = 'backupKey';
     data.aws = {
-        backupBucket: 'dev-cloudron-backups',   // FIXME this should be set to the correct bucket in CaaS
-        backupPrefix: 'backups',                // FIXME this should be set to boxId for CaaS
-        accessKeyId: null,
-        secretAccessKey: null
+        backupBucket: null,
+        backupPrefix: null,
+        accessKeyId: null,      // selfhosting only
+        secretAccessKey: null   // selfhosting only
     };
 
     if (exports.CLOUDRON) {