diff --git a/src/cloudron.js b/src/cloudron.js
index 2f6607601..858380ce4 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -708,7 +708,7 @@ function doUpdate(boxUpdateInfo, callback) {
             version: boxUpdateInfo.version
         };
 
-        debug('updating box %s %j', boxUpdateInfo.sourceTarballUrl, data);
+        debug('updating box %s %j', boxUpdateInfo.sourceTarballUrl, _.omit(data, 'tlsCert', 'tlsKey', 'token', 'appstore', 'caas'));
 
         progress.set(progress.UPDATE, 5, 'Downloading and extracting new version');
 
diff --git a/src/shell.js b/src/shell.js
index 12661eb67..0a5fe60e4 100644
--- a/src/shell.js
+++ b/src/shell.js
@@ -37,7 +37,7 @@ function exec(tag, file, args, callback) {
 
     callback = once(callback); // exit may or may not be called after an 'error'
 
-    debug(tag + ' execFile: %s %s', file, args.join(' '));
+    debug(tag + ' execFile: %s', file); // do not dump args as it might have sensitive info
 
     var cp = child_process.spawn(file, args);
     cp.stdout.on('data', function (data) {