diff --git a/lib/private/SystemConfig.php b/lib/private/SystemConfig.php
index 444e5842437a4..64cc805f9f3b3 100644
--- a/lib/private/SystemConfig.php
+++ b/lib/private/SystemConfig.php
@@ -64,13 +64,24 @@ class SystemConfig {
 		],
 		'objectstore' => [
 			'arguments' => [
-				'password' => true,
+				// Legacy Swift (https://github.com/nextcloud/server/pull/17696#discussion_r341302207)
 				'options' => [
 					'credentials' => [
 						'key' => true,
 						'secret' => true,
 					]
-				]
+				],
+				// S3
+				'key' => true,
+				'secret' => true,
+				// Swift v2
+				'username' => true,
+				'password' => true,
+				// Swift v3
+				'user' => [
+					'name' => true,
+					'password' => true,
+				],
 			],
 		],
 	];