diff --git a/appinfo/info.xml b/appinfo/info.xml
index ecbdf8608..4f7f9c526 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -12,7 +12,7 @@
 Those groups of people can then be used by any other app for sharing purpose.
 		]]>
 	</description>
-	<version>35.0.0-dev.0</version>
+	<version>35.0.0-dev.1</version>
 	<licence>agpl</licence>
 	<author>Maxence Lange</author>
 	<types>
@@ -100,5 +100,7 @@ Those groups of people can then be used by any other app for sharing purpose.
 
 	<settings>
 		<admin>OCA\Circles\Settings\Admin</admin>
+		<admin>OCA\Circles\Settings\AdminTeamFolders</admin>
+		<admin-section>OCA\Circles\Settings\AdminSection</admin-section>
 	</settings>
 </info>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index ed5137e22..9066dc52e 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -41,6 +41,9 @@
 		['name' => 'Local#uploadAvatar', 'url' => '/circles/{circleId}/avatar', 'verb' => 'POST'],
 		['name' => 'Local#removeAvatar', 'url' => '/circles/{circleId}/avatar', 'verb' => 'DELETE'],
 		['name' => 'Local#link', 'url' => '/link/{circleId}/{singleId}', 'verb' => 'GET'],
+		['name' => 'TeamFolder#getTeamFolder', 'url' => '/teams/{circleId}/folder', 'verb' => 'GET'],
+		['name' => 'TeamFolder#unlinkTeamFolder', 'url' => '/teams/{circleId}/folder', 'verb' => 'DELETE'],
+		['name' => 'TeamFolder#upgradeTeamFolder', 'url' => '/teams/{circleId}/folder', 'verb' => 'POST'],
 
 		// Teams Dashboard widget endpoint
 		['name' => 'TeamsDashboard#getCompleteTeamsData', 'url' => '/teams/dashboard/widget', 'verb' => 'GET'],
diff --git a/css/teams-dashboard.css b/css/teams-dashboard.css
index cdc980871..f9f0ef1c6 100644
--- a/css/teams-dashboard.css
+++ b/css/teams-dashboard.css
@@ -1,5 +1,3 @@
 /* extracted by css-entry-points-plugin */
-@import './dashboard-BQNkvnbt.chunk.css';
-@import './logger-CNf09jSX.chunk.css';
-@import './NcActionRouter-vYFtIOzD-BuuqIKuh.chunk.css';
-@import './NcAvatar-DX-Nk9Es-DvtEJIrI.chunk.css';
\ No newline at end of file
+@import './dashboard-DsW2gQLu.chunk.css';
+@import './index-UyurHCn6.chunk.css';
\ No newline at end of file
diff --git a/css/teams-main.css b/css/teams-main.css
index 205266856..e359f3383 100644
--- a/css/teams-main.css
+++ b/css/teams-main.css
@@ -1,10 +1,3 @@
 /* extracted by css-entry-points-plugin */
-@import './main-D5fDg73W.chunk.css';
-@import './logger-CNf09jSX.chunk.css';
-@import './NcCheckboxRadioSwitch-BVTMQSAg-rNRsAuW3.chunk.css';
-@import './NcActionRouter-vYFtIOzD-BuuqIKuh.chunk.css';
-@import './index-B8JF8h-K.chunk.css';
-@import './NcAvatar-DX-Nk9Es-DvtEJIrI.chunk.css';
-@import './index-bfXBK-tQ.chunk.css';
-@import './index--xyrXnuf.chunk.css';
-@import './NcSettingsSection-DmfxX2se-D7mIRwIy.chunk.css';
\ No newline at end of file
+@import './main-CFgzRPpb.chunk.css';
+@import './index-UyurHCn6.chunk.css';
\ No newline at end of file
diff --git a/css/teams-settings-admin.css b/css/teams-settings-admin.css
index 6227d23fd..f90d85f75 100644
--- a/css/teams-settings-admin.css
+++ b/css/teams-settings-admin.css
@@ -1,5 +1,3 @@
 /* extracted by css-entry-points-plugin */
-@import './settings-admin-D9UlOAjC.chunk.css';
-@import './logger-CNf09jSX.chunk.css';
-@import './NcCheckboxRadioSwitch-BVTMQSAg-rNRsAuW3.chunk.css';
-@import './NcSettingsSection-DmfxX2se-D7mIRwIy.chunk.css';
\ No newline at end of file
+@import './settings-admin-BEZBKJuE.chunk.css';
+@import './index-UyurHCn6.chunk.css';
\ No newline at end of file
diff --git a/css/teams-settings-team-folders.css b/css/teams-settings-team-folders.css
new file mode 100644
index 000000000..2ccd34910
--- /dev/null
+++ b/css/teams-settings-team-folders.css
@@ -0,0 +1,3 @@
+/* extracted by css-entry-points-plugin */
+@import './settings-team-folders-Kw2lcKKl.chunk.css';
+@import './index-UyurHCn6.chunk.css';
\ No newline at end of file
diff --git a/img/circles-dark.svg b/img/circles-dark.svg
index 73ecb1e9c..c916698e6 100644
--- a/img/circles-dark.svg
+++ b/img/circles-dark.svg
@@ -1,4 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
 	<path
+		fill="currentColor"
 		d="M12,5.5A3.5,3.5 0 0,1 15.5,9A3.5,3.5 0 0,1 12,12.5A3.5,3.5 0 0,1 8.5,9A3.5,3.5 0 0,1 12,5.5M5,8C5.56,8 6.08,8.15 6.53,8.42C6.38,9.85 6.8,11.27 7.66,12.38C7.16,13.34 6.16,14 5,14A3,3 0 0,1 2,11A3,3 0 0,1 5,8M19,8A3,3 0 0,1 22,11A3,3 0 0,1 19,14C17.84,14 16.84,13.34 16.34,12.38C17.2,11.27 17.62,9.85 17.47,8.42C17.92,8.15 18.44,8 19,8M5.5,18.25C5.5,16.18 8.41,14.5 12,14.5C15.59,14.5 18.5,16.18 18.5,18.25V20H5.5V18.25M0,20V18.5C0,17.11 1.89,15.94 4.45,15.6C3.86,16.28 3.5,17.22 3.5,18.25V20H0M24,20H20.5V18.25C20.5,17.22 20.14,16.28 19.55,15.6C22.11,15.94 24,17.11 24,18.5V20Z" />
 </svg>
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 7aee8dad7..3e3970014 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -14,6 +14,7 @@
 use OCA\Circles\Events\AddingCircleMemberEvent;
 use OCA\Circles\Events\CircleMemberAddedEvent;
 use OCA\Circles\Events\CircleMemberRemovedEvent;
+use OCA\Circles\Events\CreatingCircleEvent;
 use OCA\Circles\Events\DestroyingCircleEvent;
 use OCA\Circles\Events\Files\CreatingFileShareEvent;
 use OCA\Circles\Events\Files\FileShareCreatedEvent;
@@ -40,12 +41,15 @@
 use OCA\Circles\Listeners\GroupMemberRemoved;
 use OCA\Circles\Listeners\NodeEventListener;
 use OCA\Circles\Listeners\Notifications\RequestingMember as ListenerNotificationsRequestingMember;
+use OCA\Circles\Listeners\TeamFolderLifecycleListener;
 use OCA\Circles\Listeners\UserCreated;
 use OCA\Circles\Listeners\UserDeleted;
 use OCA\Circles\MountManager\CircleMountProvider;
 use OCA\Circles\Notification\Notifier;
 use OCA\Circles\Search\UnifiedSearchProvider;
 use OCA\Circles\Service\ConfigService;
+use OCA\Circles\Service\TeamFolderPolicy;
+use OCA\Circles\Service\TeamFolderService;
 use OCA\Circles\ShareByCircleProvider;
 use OCP\Accounts\UserUpdatedEvent;
 use OCP\AppFramework\App;
@@ -113,6 +117,8 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(GroupDeletedEvent::class, GroupDeleted::class);
 		$context->registerEventListener(UserAddedEvent::class, GroupMemberAdded::class);
 		$context->registerEventListener(UserRemovedEvent::class, GroupMemberRemoved::class);
+		$context->registerEventListener(CreatingCircleEvent::class, TeamFolderLifecycleListener::class);
+		$context->registerEventListener(DestroyingCircleEvent::class, TeamFolderLifecycleListener::class);
 
 		// Local Events (for Files/Shares/Notifications management)
 		$context->registerEventListener(PreparingCircleMemberEvent::class, ListenerFilesPreparingMemberSendMail::class);
@@ -139,6 +145,10 @@ public function register(IRegistrationContext $context): void {
 		$context->registerTeamResourceProvider(FileSharingTeamResourceProvider::class);
 
 		$context->registerConfigLexicon(ConfigLexicon::class);
+
+		// The lifecycle listener resolves this policy locally before invoking an
+		// optional core Teams folder provider.
+		$context->registerServiceAlias(TeamFolderPolicy::class, TeamFolderService::class);
 	}
 
 	/**
diff --git a/lib/AppInfo/Capabilities.php b/lib/AppInfo/Capabilities.php
index 6210557d2..48e151f78 100644
--- a/lib/AppInfo/Capabilities.php
+++ b/lib/AppInfo/Capabilities.php
@@ -107,7 +107,8 @@ private function getCapabilitiesCircleConstants(): array {
 				Circle::CFG_ROOT => $this->l10n->t('Root'),
 				Circle::CFG_CIRCLE_INVITE => $this->l10n->t('Team invite'),
 				Circle::CFG_FEDERATED => $this->l10n->t('Federated'),
-				Circle::CFG_MOUNTPOINT => $this->l10n->t('Mount point')
+				Circle::CFG_MOUNTPOINT => $this->l10n->t('Mount point'),
+				Circle::CFG_APP => $this->l10n->t('App')
 			],
 			'source'
 				=> [
diff --git a/lib/ConfigLexicon.php b/lib/ConfigLexicon.php
index 2a83a9997..4337fd4d1 100644
--- a/lib/ConfigLexicon.php
+++ b/lib/ConfigLexicon.php
@@ -24,6 +24,8 @@ class ConfigLexicon implements ILexicon {
 	public const FEDERATED_TEAMS_ENABLED = 'federated_teams_enabled';
 	public const FEDERATED_TEAMS_FRONTAL = 'federated_teams_frontal';
 	public const REMOVE_SHARE_TOKENS_DONE = 'remove_share_tokens_done';
+	public const TEAM_FOLDER_AUTO_CREATE = 'team_folder_auto_create';
+	public const TEAM_FOLDER_DEFAULT_QUOTA = 'team_folder_default_quota';
 
 	public function getStrictness(): Strictness {
 		return Strictness::IGNORE;
@@ -34,6 +36,8 @@ public function getAppConfigs(): array {
 			new Entry(key: self::FEDERATED_TEAMS_ENABLED, type: ValueType::BOOL, defaultRaw: false, definition: 'disable/enable Federated Teams', lazy: true),
 			new Entry(key: self::FEDERATED_TEAMS_FRONTAL, type: ValueType::STRING, defaultRaw: '', definition: 'domain name used to auth public request', lazy: true),
 			new Entry(key: self::REMOVE_SHARE_TOKENS_DONE, type: ValueType::BOOL, defaultRaw: false, definition: 'whether the remove share tokens repair step has already been executed', lazy: true),
+			new Entry(key: self::TEAM_FOLDER_AUTO_CREATE, type: ValueType::BOOL, defaultRaw: true, definition: 'automatically create a team folder when a new team is created', lazy: true),
+			new Entry(key: self::TEAM_FOLDER_DEFAULT_QUOTA, type: ValueType::INT, defaultRaw: 0, definition: 'default quota in bytes for auto-created team folders (0 means unlimited)', lazy: true),
 		];
 	}
 
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index ef8be13bb..6b6c3eb20 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -40,6 +40,20 @@ public function setValue(string $key, string $value): DataResponse {
 			return $this->getValues();
 		}
 
+		if ($key === ConfigLexicon::TEAM_FOLDER_AUTO_CREATE) {
+			$this->appConfig->setAppValueBool(ConfigLexicon::TEAM_FOLDER_AUTO_CREATE, $value === 'yes');
+			return $this->getValues();
+		}
+
+		if ($key === ConfigLexicon::TEAM_FOLDER_DEFAULT_QUOTA) {
+			if (!is_numeric($value) || (int)$value < 0) {
+				return new DataResponse(['data' => ['message' => 'quota must be a non-negative integer']], Http::STATUS_BAD_REQUEST);
+			}
+
+			$this->appConfig->setAppValueInt(ConfigLexicon::TEAM_FOLDER_DEFAULT_QUOTA, (int)$value);
+			return $this->getValues();
+		}
+
 		return new DataResponse(['data' => ['message' => 'unsupported key']], Http::STATUS_BAD_REQUEST);
 	}
 
@@ -47,6 +61,8 @@ public function getValues(): DataResponse {
 		return new DataResponse([
 			ConfigLexicon::FEDERATED_TEAMS_FRONTAL => $this->getFrontalValue() ?? '',
 			ConfigLexicon::FEDERATED_TEAMS_ENABLED => $this->appConfig->getAppValueBool(ConfigLexicon::FEDERATED_TEAMS_ENABLED),
+			ConfigLexicon::TEAM_FOLDER_AUTO_CREATE => $this->appConfig->getAppValueBool(ConfigLexicon::TEAM_FOLDER_AUTO_CREATE, true),
+			ConfigLexicon::TEAM_FOLDER_DEFAULT_QUOTA => $this->appConfig->getAppValueInt(ConfigLexicon::TEAM_FOLDER_DEFAULT_QUOTA, 0),
 		]);
 	}
 
diff --git a/lib/Controller/TeamFolderController.php b/lib/Controller/TeamFolderController.php
new file mode 100644
index 000000000..d8beae7a1
--- /dev/null
+++ b/lib/Controller/TeamFolderController.php
@@ -0,0 +1,139 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Circles\Controller;
+
+use OCA\Circles\Db\CircleRequest;
+use OCA\Circles\Exceptions\CircleNotFoundException;
+use OCA\Circles\Exceptions\InsufficientPermissionException;
+use OCA\Circles\Service\PermissionService;
+use OCA\Circles\Service\TeamFolderPolicy;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCS\OCSException;
+use OCP\AppFramework\OCS\OCSNotFoundException;
+use OCP\AppFramework\OCSController;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\IRequest;
+use OCP\IUser;
+use OCP\IUserSession;
+use OCP\Teams\ITeamManager;
+use OCP\Teams\Team;
+
+class TeamFolderController extends OCSController {
+	public function __construct(
+		string $appName,
+		IRequest $request,
+		private readonly ITeamManager $teamManager,
+		private readonly TeamFolderPolicy $policy,
+		private readonly CircleRequest $circleRequest,
+		private readonly PermissionService $permissionService,
+		private readonly IUserSession $userSession,
+	) {
+		parent::__construct($appName, $request);
+	}
+
+	#[NoAdminRequired]
+	public function getTeamFolder(string $circleId): DataResponse {
+		$this->requireMember($circleId);
+		$folder = $this->getProvider()->getTeamFolder($circleId);
+		if ($folder === null) {
+			throw new OCSNotFoundException('No team folder linked to this team');
+		}
+
+		return new DataResponse($folder->jsonSerialize());
+	}
+
+	#[NoAdminRequired]
+	public function upgradeTeamFolder(string $circleId): DataResponse {
+		$circle = $this->getCircle($circleId);
+		$this->requireTeamAdmin($circleId);
+		$folder = $this->getProvider()->createTeamFolder(
+			new Team(
+				teamId: $circle->getSingleId(),
+				displayName: $circle->getDisplayName(),
+				link: null,
+			),
+			$this->policy->getDefaultQuota(),
+		);
+
+		return new DataResponse([
+			'success' => true,
+			'folderId' => $folder->getId(),
+			'folder' => $folder->jsonSerialize(),
+		]);
+	}
+
+	#[NoAdminRequired]
+	public function unlinkTeamFolder(string $circleId, bool $deleteFolder = false): DataResponse {
+		$this->requireTeamOwner($circleId);
+		$provider = $this->getProvider();
+		if ($deleteFolder) {
+			$changed = $provider->removeTeamFolder($circleId);
+		} else {
+			$changed = $provider->unlinkTeamFolder($circleId) !== null;
+		}
+		if (!$changed) {
+			throw new OCSNotFoundException('No team folder linked to this team');
+		}
+
+		return new DataResponse(['success' => true]);
+	}
+
+	private function getProvider(): \OCP\Teams\ITeamFolderProvider {
+		$provider = $this->teamManager->getTeamFolderProvider();
+		if ($provider === null) {
+			throw new OCSNotFoundException('No team folder provider is enabled');
+		}
+
+		return $provider;
+	}
+
+	private function getCircle(string $circleId): \OCA\Circles\Model\Circle {
+		try {
+			return $this->circleRequest->getCircle($circleId);
+		} catch (CircleNotFoundException) {
+			throw new OCSNotFoundException('Team not found');
+		}
+	}
+
+	private function requireMember(string $circleId): void {
+		try {
+			$this->permissionService->userMustBeMember($this->getAuthenticatedUser()->getUID(), $circleId);
+		} catch (InsufficientPermissionException $e) {
+			throw new OCSException($e->getMessage(), Http::STATUS_FORBIDDEN);
+		}
+	}
+
+	private function requireTeamAdmin(string $circleId): void {
+		try {
+			$this->permissionService->userMustBeAtLeastTeamAdminOrServerAdmin($this->getAuthenticatedUser()->getUID(), $circleId);
+		} catch (InsufficientPermissionException $e) {
+			throw new OCSException($e->getMessage(), Http::STATUS_FORBIDDEN);
+		}
+	}
+
+	private function requireTeamOwner(string $circleId): void {
+		try {
+			$member = $this->permissionService->userMustBeMember($this->getAuthenticatedUser()->getUID(), $circleId);
+			$this->permissionService->memberMustBeOwner($member);
+		} catch (InsufficientPermissionException $e) {
+			throw new OCSException($e->getMessage(), Http::STATUS_FORBIDDEN);
+		}
+	}
+
+	private function getAuthenticatedUser(): IUser {
+		$user = $this->userSession->getUser();
+		if ($user === null) {
+			throw new OCSException('Authentication required', Http::STATUS_UNAUTHORIZED);
+		}
+
+		return $user;
+	}
+}
diff --git a/lib/Db/CoreQueryBuilder.php b/lib/Db/CoreQueryBuilder.php
index f6c76c9cf..9e84eed55 100644
--- a/lib/Db/CoreQueryBuilder.php
+++ b/lib/Db/CoreQueryBuilder.php
@@ -1558,7 +1558,7 @@ public function limitToMountpoints(string $aliasMount, array $paths, bool $forCh
 	 */
 	private function generateCircleSelectAlias(string $alias, array $default = []): self {
 		$this->generateSelectAlias(
-			CoreRequestBuilder::$tables[CoreRequestBuilder::TABLE_CIRCLE],
+			$this->filterExistingCircleColumns(CoreRequestBuilder::$tables[CoreRequestBuilder::TABLE_CIRCLE]),
 			$alias,
 			$alias,
 			$default
@@ -1567,6 +1567,44 @@ private function generateCircleSelectAlias(string $alias, array $default = []):
 		return $this;
 	}
 
+	/**
+	 * @param list<string> $fields
+	 * @return list<string>
+	 */
+	private function filterExistingCircleColumns(array $fields): array {
+		static $columns = null;
+
+		if ($columns === null) {
+			$columns = false;
+			try {
+				$connection = $this->getConnection();
+				$tableName = CoreRequestBuilder::TABLE_CIRCLE;
+				if ($connection instanceof \OC\DB\Connection) {
+					$tableName = $connection->getPrefix() . $tableName;
+				}
+				$schema = $connection->createSchema();
+				if ($schema->hasTable($tableName)) {
+					$columns = array_map(
+						static fn ($column): string => strtolower($column->getName()),
+						$schema->getTable($tableName)->getColumns()
+					);
+				}
+			} catch (\Throwable) {
+				// Preserve the original query behavior if introspection is unavailable.
+				$columns = false;
+			}
+		}
+
+		if ($columns === false) {
+			return $fields;
+		}
+
+		return array_values(array_filter(
+			$fields,
+			static fn (string $field): bool => in_array(strtolower($field), $columns, true)
+		));
+	}
+
 	/**
 	 * @param string $alias
 	 * @param array $default
diff --git a/lib/Listeners/TeamFolderLifecycleListener.php b/lib/Listeners/TeamFolderLifecycleListener.php
new file mode 100644
index 000000000..72bddef8f
--- /dev/null
+++ b/lib/Listeners/TeamFolderLifecycleListener.php
@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Circles\Listeners;
+
+use OCA\Circles\Events\CreatingCircleEvent;
+use OCA\Circles\Events\DestroyingCircleEvent;
+use OCA\Circles\Service\TeamFolderPolicy;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Teams\ITeamManager;
+use OCP\Teams\Team;
+use Psr\Log\LoggerInterface;
+
+/**
+ * @template-implements IEventListener<CreatingCircleEvent|DestroyingCircleEvent>
+ */
+class TeamFolderLifecycleListener implements IEventListener {
+	public function __construct(
+		private readonly ITeamManager $teamManager,
+		private readonly TeamFolderPolicy $policy,
+		private readonly LoggerInterface $logger,
+	) {
+	}
+
+	#[\Override]
+	public function handle(Event $event): void {
+		if ($event instanceof DestroyingCircleEvent) {
+			$provider = $this->teamManager->getTeamFolderProvider();
+			if ($provider === null) {
+				return;
+			}
+
+			$circle = $event->getCircle();
+			$provider->unlinkTeamFolder($circle->getSingleId());
+			return;
+		}
+
+		if (!$event instanceof CreatingCircleEvent) {
+			return;
+		}
+
+		$circle = $event->getCircle();
+		if (!$this->policy->shouldCreateTeamFolder($circle)) {
+			return;
+		}
+
+		$provider = $this->teamManager->getTeamFolderProvider();
+		if ($provider === null) {
+			return;
+		}
+
+		try {
+			$provider->createTeamFolder(
+				new Team(
+					teamId: $circle->getSingleId(),
+					displayName: $circle->getDisplayName(),
+					link: null,
+				),
+				$this->policy->getDefaultQuota(),
+			);
+		} catch (\Throwable $e) {
+			$this->logger->error('Failed to auto-create team folder', [
+				'teamId' => $circle->getSingleId(),
+				'exception' => $e,
+			]);
+		}
+	}
+}
diff --git a/lib/Migration/Version3500Date20260721000001.php b/lib/Migration/Version3500Date20260721000001.php
new file mode 100644
index 000000000..3fa4f1a6f
--- /dev/null
+++ b/lib/Migration/Version3500Date20260721000001.php
@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Circles\Migration;
+
+use Closure;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Removes legacy team-folder metadata from Circles. Groupfolders owns the
+ * relationship through its `team_circle_id` column, so Circles must not
+ * maintain a second copy.
+ */
+class Version3500Date20260721000001 extends SimpleMigrationStep {
+	private const CFG_TEAM_FOLDER_LEGACY = 262144;
+
+	public function __construct(
+		private readonly IDBConnection $connection,
+		private readonly LoggerInterface $logger,
+	) {
+	}
+
+	#[\Override]
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+		$query = $this->connection->getQueryBuilder();
+		$query->select('unique_id', 'settings', 'config')
+			->from('circles_circle');
+		$result = $query->executeQuery();
+
+		$migrated = 0;
+		while (($row = $result->fetch()) !== false) {
+			$uniqueId = (string)$row['unique_id'];
+			$rawSettings = $row['settings'] ?? null;
+			$config = (int)($row['config'] ?? 0);
+
+			$settings = [];
+			if ($rawSettings !== null && $rawSettings !== '') {
+				try {
+					$decoded = json_decode($rawSettings, true, 512, JSON_THROW_ON_ERROR);
+					if (is_array($decoded)) {
+						$settings = $decoded;
+					}
+				} catch (\JsonException $e) {
+					$this->logger->warning(
+						'Could not decode circles_circle settings during team_folder_id backfill',
+						['unique_id' => $uniqueId, 'exception' => $e],
+					);
+					continue;
+				}
+			}
+
+			$hadEssentialKey = array_key_exists('team_folder_essential', $settings)
+				|| array_key_exists('team_folder_id', $settings);
+
+			if (!$hadEssentialKey && ($config & self::CFG_TEAM_FOLDER_LEGACY) === 0) {
+				continue;
+			}
+
+			unset($settings['team_folder_id'], $settings['team_folder_essential']);
+			$newConfig = $config & ~self::CFG_TEAM_FOLDER_LEGACY;
+
+			$update = $this->connection->getQueryBuilder();
+			$update->update('circles_circle')
+				->set('settings', $update->createNamedParameter(json_encode($settings, JSON_THROW_ON_ERROR)))
+				->set('config', $update->createNamedParameter($newConfig, IQueryBuilder::PARAM_INT))
+				->where($update->expr()->eq('unique_id', $update->createNamedParameter($uniqueId)));
+			$update->executeStatement();
+			$migrated++;
+		}
+		$result->closeCursor();
+
+		if ($migrated > 0) {
+			$this->logger->info('Removed legacy Circles team folder metadata', [
+				'migrated' => $migrated,
+			]);
+		}
+	}
+}
diff --git a/lib/Migration/Version3500Date20260722000001.php b/lib/Migration/Version3500Date20260722000001.php
new file mode 100644
index 000000000..22d5abf9a
--- /dev/null
+++ b/lib/Migration/Version3500Date20260722000001.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Circles\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * Remove the obsolete mirrored Groupfolders link.
+ *
+ * Groupfolders' unique `group_folders.team_circle_id` is the authoritative
+ * relationship. Keeping a second identifier in Circles required cross-app
+ * database writes and could become inconsistent.
+ */
+class Version3500Date20260722000001 extends SimpleMigrationStep {
+	#[\Override]
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+		$table = $schema->getTable('circles_circle');
+
+		if ($table->hasIndex('circles_team_folder')) {
+			$table->dropIndex('circles_team_folder');
+		}
+		if ($table->hasColumn('team_folder_id')) {
+			$table->dropColumn('team_folder_id');
+		}
+
+		return $schema;
+	}
+}
diff --git a/lib/Model/Circle.php b/lib/Model/Circle.php
index 5b236097f..a29fa2e0b 100644
--- a/lib/Model/Circle.php
+++ b/lib/Model/Circle.php
@@ -116,7 +116,7 @@ class Circle extends ManagedModel implements IEntity, IDeserializable, IQueryRow
 		16384 => 'CI|Circle Invite',
 		32768 => 'F|Federated',
 		65536 => 'M|Nountpoint',
-		131072 => 'A|App'
+		131072 => 'A|App',
 	];
 
 	/**
@@ -141,7 +141,7 @@ class Circle extends ManagedModel implements IEntity, IDeserializable, IQueryRow
 	public static $DEF_CFG_CORE_FILTER = [
 		1,
 		2,
-		4
+		4,
 	];
 
 	public static $DEF_CFG_SYSTEM_FILTER = [
@@ -801,7 +801,7 @@ public function jsonSerialize(): array {
 			'description' => $this->getDescription(),
 			'url' => $this->getUrl(),
 			'creation' => $this->getCreation(),
-			'initiator' => ($this->hasInitiator()) ? $this->getInitiator() : null
+			'initiator' => ($this->hasInitiator()) ? $this->getInitiator() : null,
 		];
 
 		if ($this->hasOwner()) {
diff --git a/lib/Service/PermissionService.php b/lib/Service/PermissionService.php
index 5651bd71e..9936eea6b 100644
--- a/lib/Service/PermissionService.php
+++ b/lib/Service/PermissionService.php
@@ -21,6 +21,7 @@
 use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\Helpers\MemberHelper;
 use OCA\Circles\Model\Member;
+use OCP\IGroupManager;
 use OCP\IL10N;
 
 class PermissionService {
@@ -31,6 +32,7 @@ public function __construct(
 		private readonly ConfigService $configService,
 		private readonly MemberRequest $memberRequest,
 		private readonly MembershipRequest $membershipRequest,
+		private readonly IGroupManager $groupManager,
 	) {
 	}
 
@@ -206,4 +208,34 @@ public function memberMustBeHigherLevelThan(Member $memberUser, string $targetMe
 			);
 		}
 	}
+
+	/**
+	 * Returns true if the given user id is a Nextcloud server admin (member
+	 * of the `admin` group). Server admins are allowed to bypass per-team
+	 * permission checks for administrative operations such as creating a
+	 * team folder.
+	 *
+	 * @param string $userId
+	 * @return bool
+	 */
+	public function isServerAdmin(string $userId): bool {
+		return $this->groupManager->isAdmin($userId);
+	}
+
+	/**
+	 * Require the current user to be at least a team admin (level ADMIN) of
+	 * the given circle, or a Nextcloud server admin.
+	 *
+	 * @param string $userId
+	 * @param string $circleId
+	 * @throws InsufficientPermissionException
+	 */
+	public function userMustBeAtLeastTeamAdminOrServerAdmin(string $userId, string $circleId): void {
+		if ($this->isServerAdmin($userId)) {
+			return;
+		}
+
+		$member = $this->userMustBeMember($userId, $circleId);
+		$this->memberMustBeAtLeastAdmin($member);
+	}
 }
diff --git a/lib/Service/TeamFolderPolicy.php b/lib/Service/TeamFolderPolicy.php
new file mode 100644
index 000000000..0d6da32a7
--- /dev/null
+++ b/lib/Service/TeamFolderPolicy.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Circles\Service;
+
+use OCA\Circles\Model\Circle;
+
+/**
+ * Policy interface for team folder creation.
+ *
+ * The circles app owns the *policy* (auto-create toggle, default quota, which
+ * circle types qualify); the groupfolders app owns the *orchestration*
+ * (creating, unlinking, removing folders) and consumes this interface to ask
+ * circles whether a given circle should get a team folder and what quota to
+ * assign, without duplicating the policy logic. The circles app keeps no
+ * reference to the groupfolders app.
+ *
+ * Implementation: {@see TeamFolderService} in the circles app.
+ */
+interface TeamFolderPolicy {
+	/**
+	 * Whether a team folder should be auto-created for the given circle.
+	 *
+	 * Personal, hidden, system, and backend circles are excluded; the
+	 * `team_folder_auto_create` app config must be enabled.
+	 */
+	public function shouldCreateTeamFolder(Circle $circle): bool;
+
+	/**
+	 * The configured default quota in bytes for auto-created team folders.
+	 *
+	 * A value of 0 or less means unlimited.
+	 */
+	public function getDefaultQuota(): int;
+}
diff --git a/lib/Service/TeamFolderService.php b/lib/Service/TeamFolderService.php
new file mode 100644
index 000000000..68d369d35
--- /dev/null
+++ b/lib/Service/TeamFolderService.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Circles\Service;
+
+use OCA\Circles\ConfigLexicon;
+use OCA\Circles\Model\Circle;
+use OCP\AppFramework\Services\IAppConfig;
+
+/**
+ * Policy for team folders owned by teams (circles).
+ *
+ * This class owns the *policy* for team-folder creation:
+ *  - the `team_folder_auto_create` app config toggle,
+ *  - the `team_folder_default_quota` app config value,
+ *  - the circle-type eligibility rules (personal/hidden/system/backend circles
+ *    are excluded).
+ *
+ * The *orchestration* (creating, unlinking, removing folders) is owned by the
+ * groupfolders app, which consumes this policy via the
+ * {@see TeamFolderPolicy} interface. The circles app keeps no reference to the
+ * groupfolders app.
+ *
+ * The Groupfolders provider owns the durable `team_circle_id` linkage. Circles
+ * never persists a Groupfolders identifier.
+ */
+class TeamFolderService implements TeamFolderPolicy {
+	public function __construct(
+		private IAppConfig $appConfig,
+	) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function shouldCreateTeamFolder(Circle $circle): bool {
+		$autoCreate = $this->appConfig->getAppValueBool(ConfigLexicon::TEAM_FOLDER_AUTO_CREATE, true);
+		if (!$autoCreate) {
+			return false;
+		}
+
+		if ($circle->isConfig(Circle::CFG_PERSONAL)) {
+			return false;
+		}
+
+		if ($circle->isConfig(Circle::CFG_HIDDEN)) {
+			return false;
+		}
+
+		if ($circle->isConfig(Circle::CFG_SYSTEM)) {
+			return false;
+		}
+
+		if ($circle->isConfig(Circle::CFG_BACKEND)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getDefaultQuota(): int {
+		return $this->appConfig->getAppValueInt(ConfigLexicon::TEAM_FOLDER_DEFAULT_QUOTA, 0);
+	}
+}
diff --git a/lib/Settings/AdminSection.php b/lib/Settings/AdminSection.php
new file mode 100644
index 000000000..20e297131
--- /dev/null
+++ b/lib/Settings/AdminSection.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Circles\Settings;
+
+use OCA\Circles\AppInfo\Application;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Settings\IIconSection;
+
+class AdminSection implements IIconSection {
+	public function __construct(
+		private IL10N $l,
+		private IURLGenerator $url,
+	) {
+	}
+
+	public function getID(): string {
+		return 'teams';
+	}
+
+	public function getName(): string {
+		return $this->l->t('Teams');
+	}
+
+	public function getPriority(): int {
+		return 80;
+	}
+
+	public function getIcon(): string {
+		return $this->url->imagePath(Application::APP_ID, 'circles-dark.svg');
+	}
+}
diff --git a/lib/Settings/AdminTeamFolders.php b/lib/Settings/AdminTeamFolders.php
new file mode 100644
index 000000000..7674afed1
--- /dev/null
+++ b/lib/Settings/AdminTeamFolders.php
@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Circles\Settings;
+
+use OCA\Circles\AppInfo\Application;
+use OCA\Circles\ConfigLexicon;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
+use OCP\IAppConfig;
+use OCP\IL10N;
+use OCP\Settings\IDelegatedSettings;
+
+class AdminTeamFolders implements IDelegatedSettings {
+	/**
+	 * AdminTeamFolders constructor.
+	 */
+	public function __construct(
+		private IAppConfig $appConfig,
+		private IL10N $l,
+		private IInitialState $initialState,
+	) {
+	}
+
+	/**
+	 * @return TemplateResponse
+	 */
+	public function getForm(): TemplateResponse {
+		$teamFolderAutoCreate = $this->appConfig->getValueBool(Application::APP_ID, ConfigLexicon::TEAM_FOLDER_AUTO_CREATE, true);
+		$teamFolderDefaultQuota = $this->appConfig->getValueInt(Application::APP_ID, ConfigLexicon::TEAM_FOLDER_DEFAULT_QUOTA, 0);
+
+		$this->initialState->provideInitialState('teamFolderAutoCreate', $teamFolderAutoCreate);
+		$this->initialState->provideInitialState('teamFolderDefaultQuota', $teamFolderDefaultQuota);
+
+		\OCP\Util::addStyle(Application::APP_ID, 'teams-settings-team-folders');
+		\OCP\Util::addScript(Application::APP_ID, 'teams-settings-team-folders');
+
+		return new TemplateResponse(Application::APP_ID, 'settings-team-folders', renderAs: '');
+	}
+
+	/**
+	 * @return string the section ID, e.g. 'sharing'
+	 */
+	public function getSection(): string {
+		return 'teams';
+	}
+
+	/**
+	 * @return int whether the form should be rather on the top or bottom of
+	 *             the admin section. The forms are arranged in ascending order of the
+	 *             priority values. It is required to return a value between 0 and 100.
+	 *
+	 * E.g.: 70
+	 */
+	public function getPriority(): int {
+		return 50;
+	}
+
+	public function getName(): ?string {
+		return $this->l->t('Team spaces');
+	}
+
+	public function getAuthorizedAppConfig(): array {
+		return [
+			Application::APP_ID => [
+				ConfigLexicon::TEAM_FOLDER_AUTO_CREATE,
+				ConfigLexicon::TEAM_FOLDER_DEFAULT_QUOTA,
+			],
+		];
+	}
+}
diff --git a/lib/StatusCode.php b/lib/StatusCode.php
index eeba47faa..30597a3ea 100644
--- a/lib/StatusCode.php
+++ b/lib/StatusCode.php
@@ -53,7 +53,7 @@ class StatusCode {
 	];
 
 	public static $CIRCLE_DESTROY = [
-		120 => 'Team is managed from an other app'
+		120 => 'Team is managed from an other app',
 	];
 
 	public static $MEMBER_LEVEL = [
diff --git a/package-lock.json b/package-lock.json
index 609ee896a..70eb4a8d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "@nextcloud/axios": "^2.5.1",
         "@nextcloud/cdav-library": "^2.6.2",
         "@nextcloud/dialogs": "^7.4.0",
+        "@nextcloud/files": "^3.12.2",
         "@nextcloud/l10n": "^3.4.1",
         "@nextcloud/logger": "^3.0.2",
         "@nextcloud/password-confirmation": "^6.1.0",
@@ -354,6 +355,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=20.19.0"
       },
@@ -402,6 +404,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=20.19.0"
       }
@@ -1599,6 +1602,66 @@
         "node": "^20 || ^22 || ^24"
       }
     },
+    "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/files": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-4.0.0.tgz",
+      "integrity": "sha512-TmecnZIS+PGWGtRh7RpGEboCT4K6iTbHULUcfR6hs3eEzjDVsCc1Ldf8popGY/70lbpdlfYle8xbXnPIo3qaXA==",
+      "license": "AGPL-3.0-or-later",
+      "dependencies": {
+        "@nextcloud/auth": "^2.5.3",
+        "@nextcloud/capabilities": "^1.2.1",
+        "@nextcloud/l10n": "^3.4.1",
+        "@nextcloud/logger": "^3.0.3",
+        "@nextcloud/paths": "^3.0.0",
+        "@nextcloud/router": "^3.1.0",
+        "@nextcloud/sharing": "^0.3.0",
+        "is-svg": "^6.1.0",
+        "typescript-event-target": "^1.1.2",
+        "webdav": "^5.9.0"
+      },
+      "engines": {
+        "node": "^24.0.0"
+      }
+    },
+    "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/files/node_modules/@nextcloud/files": {
+      "version": "3.12.2",
+      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-3.12.2.tgz",
+      "integrity": "sha512-vBo8tf3Xh6efiF8CrEo3pKj9AtvAF6RdDGO1XKL65IxV8+UUd9Uxl2lUExHlzoDRRczCqfGfaWfRRaFhYqce5Q==",
+      "license": "AGPL-3.0-or-later",
+      "optional": true,
+      "dependencies": {
+        "@nextcloud/auth": "^2.5.3",
+        "@nextcloud/capabilities": "^1.2.1",
+        "@nextcloud/l10n": "^3.4.1",
+        "@nextcloud/logger": "^3.0.3",
+        "@nextcloud/paths": "^3.0.0",
+        "@nextcloud/router": "^3.1.0",
+        "@nextcloud/sharing": "^0.3.0",
+        "cancelable-promise": "^4.3.1",
+        "is-svg": "^6.1.0",
+        "typescript-event-target": "^1.1.1",
+        "webdav": "^5.8.0"
+      },
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
+      }
+    },
+    "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/files/node_modules/@nextcloud/sharing": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@nextcloud/sharing/-/sharing-0.3.0.tgz",
+      "integrity": "sha512-kV7qeUZvd1fTKeFyH+W5Qq5rNOqG9rLATZM3U9MBxWXHJs3OxMqYQb8UQ3NYONzsX3zDGJmdQECIGHm1ei2sCA==",
+      "license": "GPL-3.0-or-later",
+      "dependencies": {
+        "@nextcloud/initial-state": "^3.0.0",
+        "is-svg": "^6.1.0"
+      },
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
+      },
+      "optionalDependencies": {
+        "@nextcloud/files": "^3.12.0"
+      }
+    },
     "node_modules/@nextcloud/dialogs/node_modules/@nextcloud/paths": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@nextcloud/paths/-/paths-3.1.0.tgz",
@@ -1713,6 +1776,7 @@
       "version": "3.5.39",
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.39.tgz",
       "integrity": "sha512-xmZCYabFGcirU8r0fTuvl/LICc1OU620rnqepaJDL/a141ZigkG7AyaxQLdqJ02ZRYzWe6YPaDHeQx7MfknQfA==",
+      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.39",
         "@vue/compiler-sfc": "3.5.39",
@@ -1786,30 +1850,10 @@
       }
     },
     "node_modules/@nextcloud/files": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-4.0.0.tgz",
-      "integrity": "sha512-TmecnZIS+PGWGtRh7RpGEboCT4K6iTbHULUcfR6hs3eEzjDVsCc1Ldf8popGY/70lbpdlfYle8xbXnPIo3qaXA==",
-      "dependencies": {
-        "@nextcloud/auth": "^2.5.3",
-        "@nextcloud/capabilities": "^1.2.1",
-        "@nextcloud/l10n": "^3.4.1",
-        "@nextcloud/logger": "^3.0.3",
-        "@nextcloud/paths": "^3.0.0",
-        "@nextcloud/router": "^3.1.0",
-        "@nextcloud/sharing": "^0.3.0",
-        "is-svg": "^6.1.0",
-        "typescript-event-target": "^1.1.2",
-        "webdav": "^5.9.0"
-      },
-      "engines": {
-        "node": "^24.0.0"
-      }
-    },
-    "node_modules/@nextcloud/files/node_modules/@nextcloud/files": {
       "version": "3.12.2",
       "resolved": "https://registry.npmjs.org/@nextcloud/files/-/files-3.12.2.tgz",
       "integrity": "sha512-vBo8tf3Xh6efiF8CrEo3pKj9AtvAF6RdDGO1XKL65IxV8+UUd9Uxl2lUExHlzoDRRczCqfGfaWfRRaFhYqce5Q==",
-      "optional": true,
+      "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@nextcloud/auth": "^2.5.3",
         "@nextcloud/capabilities": "^1.2.1",
@@ -1831,6 +1875,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@nextcloud/paths/-/paths-3.1.0.tgz",
       "integrity": "sha512-vtFYA/kthaUDzu6KejTOL1OwnOy7/yynq5zdB/UBpYacAWjUX5Ddh4OMWx3rEavkBJ9/QGhrFryNJLjNfe8OQA==",
+      "license": "GPL-3.0-or-later",
       "engines": {
         "node": "^20.0.0 || ^22.0.0 || ^24.0.0"
       }
@@ -1839,6 +1884,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@nextcloud/sharing/-/sharing-0.3.0.tgz",
       "integrity": "sha512-kV7qeUZvd1fTKeFyH+W5Qq5rNOqG9rLATZM3U9MBxWXHJs3OxMqYQb8UQ3NYONzsX3zDGJmdQECIGHm1ei2sCA==",
+      "license": "GPL-3.0-or-later",
       "dependencies": {
         "@nextcloud/initial-state": "^3.0.0",
         "is-svg": "^6.1.0"
@@ -2019,6 +2065,7 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.39.tgz",
       "integrity": "sha512-xmZCYabFGcirU8r0fTuvl/LICc1OU620rnqepaJDL/a141ZigkG7AyaxQLdqJ02ZRYzWe6YPaDHeQx7MfknQfA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.39",
         "@vue/compiler-sfc": "3.5.39",
@@ -2308,6 +2355,7 @@
       "version": "3.5.39",
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.39.tgz",
       "integrity": "sha512-xmZCYabFGcirU8r0fTuvl/LICc1OU620rnqepaJDL/a141ZigkG7AyaxQLdqJ02ZRYzWe6YPaDHeQx7MfknQfA==",
+      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.39",
         "@vue/compiler-sfc": "3.5.39",
@@ -2398,7 +2446,6 @@
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
-      "peer": true,
       "dependencies": {
         "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
@@ -2441,7 +2488,6 @@
       "os": [
         "android"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -2463,7 +2509,6 @@
       "os": [
         "darwin"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -2485,7 +2530,6 @@
       "os": [
         "darwin"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -2507,7 +2551,6 @@
       "os": [
         "freebsd"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -2529,7 +2572,6 @@
       "os": [
         "linux"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -2551,7 +2593,6 @@
       "os": [
         "linux"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -2573,7 +2614,6 @@
       "os": [
         "linux"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -2595,7 +2635,6 @@
       "os": [
         "linux"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -2617,7 +2656,6 @@
       "os": [
         "linux"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -2639,7 +2677,6 @@
       "os": [
         "linux"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -2661,7 +2698,6 @@
       "os": [
         "win32"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -2683,7 +2719,6 @@
       "os": [
         "win32"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -2705,7 +2740,6 @@
       "os": [
         "win32"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -3238,6 +3272,7 @@
       "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "json-schema-traverse": "^1.0.0",
@@ -3382,6 +3417,7 @@
       "integrity": "sha512-nPK52ZHvot8Ju/0A4ucSX1dcPV2/1clx0kLcH5wDmrE4naKso7TUC/voUyU1O9OTKTrR6MYip6LP0ogEMQ9jPQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.9.1",
         "@typescript-eslint/types": "^8.56.0",
@@ -3596,6 +3632,7 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.63.0.tgz",
       "integrity": "sha512-gwh4gvvlaVDKKxyfxMG+Gnu1u9X0OQBwyGLkbwB65dIzBKnxeRiJlNFqlI3zwVhNXJIs6qV7mlFCn/BIajlVig==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.63.0",
         "@typescript-eslint/types": "8.63.0",
@@ -3814,6 +3851,7 @@
       "integrity": "sha512-G9/lgqibheLVBDRuya45EbsEXTYcWoSG+TLg7i2axuzx0Eq62eXn+aWXyaVdV5vKvFSWd6ywcX8hA7la9Pvu8g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^1.0.2",
         "@vitest/utils": "4.1.9",
@@ -4030,6 +4068,7 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.22.tgz",
       "integrity": "sha512-W8RknzUM1BLkypvdz10OVsGxnMAuSIZs9Wdx1vzA3mL5fNMN15rhrSCLiTm6blWeACwUwizzPVqGJgOGBEN/hA==",
+      "peer": true,
       "dependencies": {
         "@vue/compiler-core": "3.5.22",
         "@vue/shared": "3.5.22"
@@ -4150,7 +4189,6 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.22.tgz",
       "integrity": "sha512-f2Wux4v/Z2pqc9+4SmgZC1p73Z53fyD90NFWXiX9AKVnVBEvLFOWCEgJD3GdGnlxPZt01PSlfmLqbLYzY/Fw4A==",
-      "peer": true,
       "dependencies": {
         "@vue/shared": "3.5.22"
       }
@@ -4159,7 +4197,6 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.22.tgz",
       "integrity": "sha512-EHo4W/eiYeAzRTN5PCextDUZ0dMs9I8mQ2Fy+OkzvRPUYQEyK9yAjbasrMCXbLNhF7P0OUyivLjIy0yc6VrLJQ==",
-      "peer": true,
       "dependencies": {
         "@vue/reactivity": "3.5.22",
         "@vue/shared": "3.5.22"
@@ -4169,7 +4206,6 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.22.tgz",
       "integrity": "sha512-Av60jsryAkI023PlN7LsqrfPvwfxOd2yAwtReCjeuugTJTkgrksYJJstg1e12qle0NarkfhfFu1ox2D+cQotww==",
-      "peer": true,
       "dependencies": {
         "@vue/reactivity": "3.5.22",
         "@vue/runtime-core": "3.5.22",
@@ -4310,6 +4346,7 @@
       "version": "8.17.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
       "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4726,7 +4763,6 @@
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "peer": true,
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -4904,6 +4940,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.19",
         "caniuse-lite": "^1.0.30001751",
@@ -5045,7 +5082,7 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/cancelable-promise/-/cancelable-promise-4.3.1.tgz",
       "integrity": "sha512-A/8PwLk/T7IJDfUdQ68NR24QHa8rIlnN/stiJEBo6dmVUkD4K14LswG0w3VwdeK/o7qOwRUR1k2MhK5Rpy2m7A==",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001751",
@@ -5142,7 +5179,6 @@
       "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "readdirp": "^4.0.1"
       },
@@ -5752,7 +5788,6 @@
       "dev": true,
       "license": "Apache-2.0",
       "optional": true,
-      "peer": true,
       "bin": {
         "detect-libc": "bin/detect-libc.js"
       },
@@ -6052,6 +6087,7 @@
       "devOptional": true,
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -6120,6 +6156,7 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.6.0.tgz",
       "integrity": "sha512-6lVbcqSodALYo+4ELD0heG6lFiFxnLMuLkiMi2qV8LMp54N8tE8FT1GMH+ev4Ti00nFjNze2+Su6DsV5OQW3Dg==",
       "dev": true,
+      "peer": true,
       "workspaces": [
         "packages/*"
       ],
@@ -6640,7 +6677,6 @@
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "peer": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -7271,8 +7307,7 @@
       "version": "5.1.9",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.9.tgz",
       "integrity": "sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/import-lazy": {
       "version": "4.0.0",
@@ -7498,7 +7533,6 @@
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "peer": true,
       "engines": {
         "node": ">=0.12.0"
       }
@@ -8760,7 +8794,6 @@
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "peer": true,
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -8775,7 +8808,6 @@
       "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "dev": true,
       "optional": true,
-      "peer": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -8988,8 +9020,7 @@
       "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true
+      "optional": true
     },
     "node_modules/node-domexception": {
       "version": "1.0.0",
@@ -9560,6 +9591,7 @@
       "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.4.tgz",
       "integrity": "sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/devtools-api": "^7.7.7"
       },
@@ -9941,7 +9973,6 @@
       "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 14.18.0"
       },
@@ -10141,6 +10172,7 @@
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.2.tgz",
       "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
       "devOptional": true,
+      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.9"
       },
@@ -11169,7 +11201,6 @@
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "peer": true,
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -11327,6 +11358,7 @@
       "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -11361,7 +11393,8 @@
     "node_modules/typescript-event-target": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/typescript-event-target/-/typescript-event-target-1.1.2.tgz",
-      "integrity": "sha512-TvkrTUpv7gCPlcnSoEwUVUBwsdheKm+HF5u2tPAKubkIGMfovdSizCTaZRY/NhR8+Ijy8iZZUapbVQAsNrkFrw=="
+      "integrity": "sha512-TvkrTUpv7gCPlcnSoEwUVUBwsdheKm+HF5u2tPAKubkIGMfovdSizCTaZRY/NhR8+Ijy8iZZUapbVQAsNrkFrw==",
+      "license": "MIT"
     },
     "node_modules/ufo": {
       "version": "1.6.4",
@@ -11754,6 +11787,7 @@
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.5.tgz",
       "integrity": "sha512-KuOaNhcnGFN2zIPGA7wRmzF+lJA1sea7rHq17aiJ++9lzY1WWG6Jpwqwe1KNbRVPIqHmr8GLYx7jbrQcN/7/ww==",
       "devOptional": true,
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -12340,6 +12374,7 @@
       "integrity": "sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vitest/expect": "4.1.9",
         "@vitest/mocker": "4.1.9",
diff --git a/package.json b/package.json
index 380afb7ce..2074b3f32 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "@nextcloud/axios": "^2.5.1",
     "@nextcloud/cdav-library": "^2.6.2",
     "@nextcloud/dialogs": "^7.4.0",
+    "@nextcloud/files": "^3.12.2",
     "@nextcloud/l10n": "^3.4.1",
     "@nextcloud/logger": "^3.0.2",
     "@nextcloud/password-confirmation": "^6.1.0",
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 478eae16f..8f6a3e1da 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -104,6 +104,7 @@ watchDebounced(federatedTeamsFrontal, async (value) => {
 	await updateAppConfig('federated_teams_frontal', value)
 	showSuccess(t('circles', 'Changed frontal cloud URL'))
 }, { debounce: 500 })
+
 </script>
 
 <template>
diff --git a/src/components/AdminTeamFolders.vue b/src/components/AdminTeamFolders.vue
new file mode 100644
index 000000000..ad8afd6a8
--- /dev/null
+++ b/src/components/AdminTeamFolders.vue
@@ -0,0 +1,163 @@
+<!--
+ - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<script setup lang="ts">
+import type { OCSResponse } from '@nextcloud/typings/ocs'
+
+import axios from '@nextcloud/axios'
+import { showError, showSuccess } from '@nextcloud/dialogs'
+import { loadState } from '@nextcloud/initial-state'
+import { t } from '@nextcloud/l10n'
+import { confirmPassword } from '@nextcloud/password-confirmation'
+import { generateOcsUrl } from '@nextcloud/router'
+import { ref } from 'vue'
+import NcButton from '@nextcloud/vue/components/NcButton'
+import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
+import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
+import NcTextField from '@nextcloud/vue/components/NcTextField'
+import { logger } from '../logger.ts'
+
+const BYTES_PER_MB = 1024 * 1024
+
+/**
+ * Convert a byte quota to a human-readable MB string.
+ *
+ * @param bytes - The quota in bytes
+ */
+function bytesToMb(bytes: number): string {
+	if (bytes === 0) {
+		return '0'
+	}
+	const mb = bytes / BYTES_PER_MB
+	return String(parseFloat(mb.toFixed(2)))
+}
+
+const teamFolderAutoCreate = ref(Boolean(loadState('circles', 'teamFolderAutoCreate', true)))
+const teamFolderDefaultQuota = ref(bytesToMb(Number(loadState('circles', 'teamFolderDefaultQuota', 0))))
+
+/**
+ * Update app configuration
+ *
+ * @param key - The config key
+ * @param value - The config value
+ */
+async function updateAppConfig(key: string, value: string): Promise<boolean> {
+	try {
+		await confirmPassword()
+
+		const url = generateOcsUrl('/apps/circles/settings/{key}', {
+			appId: 'circles',
+			key,
+		})
+		const { data } = await axios.post<OCSResponse>(url, {
+			value,
+		})
+		if (data.ocs.meta.status !== 'ok') {
+			if (data.ocs.meta.message) {
+				showError(t('circles', 'Unable to update team space config'))
+				logger.error('Error while updating team folder config', { error: data.ocs })
+				return false
+			} else {
+				throw new Error(`${data.ocs.meta.statuscode}`)
+			}
+		}
+		return true
+	} catch (error) {
+		showError(t('circles', 'Unable to update team space config'))
+		logger.error('Error while updating team folder config', { error })
+		return false
+	}
+}
+
+/**
+ * Toggle automatic team folder creation
+ */
+function onToggleTeamFolderAutoCreate() {
+	const value = teamFolderAutoCreate.value ? 'yes' : 'no'
+	updateAppConfig('team_folder_auto_create', value)
+}
+
+/**
+ * Save the default team folder quota.
+ *
+ * The user enters the value in MB; it is stored as bytes on the server.
+ */
+async function onSaveQuota() {
+	const quotaMb = Number(teamFolderDefaultQuota.value)
+	if (Number.isNaN(quotaMb) || quotaMb < 0) {
+		showError(t('circles', 'Quota must be a non-negative number.'))
+		return
+	}
+
+	const quotaBytes = Math.round(quotaMb * BYTES_PER_MB)
+	if (await updateAppConfig('team_folder_default_quota', quotaBytes.toString())) {
+		showSuccess(t('circles', 'Changed default team space quota'))
+	}
+}
+</script>
+
+<template>
+	<NcSettingsSection
+		:name="t('circles', 'Team spaces')"
+		:description="t('circles', 'Automatically create a shared team space when a new team is created. Requires the Team Folders app to be installed and enabled.')">
+		<NcCheckboxRadioSwitch
+			v-model="teamFolderAutoCreate"
+			type="switch"
+			@update:modelValue="onToggleTeamFolderAutoCreate">
+			{{ t('circles', 'Automatically create a team space') }}
+		</NcCheckboxRadioSwitch>
+
+		<div
+			v-show="teamFolderAutoCreate"
+			class="team-folders__sub-section">
+			<div class="team-folders__input-row">
+				<NcTextField
+					v-model="teamFolderDefaultQuota"
+					:label="t('circles', 'Default quota (in MB)')"
+					:placeholder="t('circles', '0 for unlimited')"
+					type="number"
+					min="0"
+					step="1"
+					class="team-folders__input" />
+				<NcButton
+					variant="primary"
+					@click="onSaveQuota">
+					{{ t('circles', 'Save') }}
+				</NcButton>
+			</div>
+
+			<p class="team-folders__hint">
+				{{ t('circles', 'Default storage quota applied to each auto-created team space. Use 0 for unlimited storage.') }}
+			</p>
+		</div>
+	</NcSettingsSection>
+</template>
+
+<style scoped>
+.team-folders__sub-section {
+	margin-top: 12px;
+	margin-left: 44px;
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+}
+
+.team-folders__input-row {
+	display: flex;
+	gap: 8px;
+	align-items: flex-end;
+	max-width: 500px;
+}
+
+.team-folders__input {
+	flex: 1;
+}
+
+.team-folders__hint {
+	color: var(--color-text-maxcontrast);
+	font-size: 14px;
+	margin: 0;
+}
+</style>
diff --git a/src/settings-team-folders.ts b/src/settings-team-folders.ts
new file mode 100644
index 000000000..151c51710
--- /dev/null
+++ b/src/settings-team-folders.ts
@@ -0,0 +1,12 @@
+/*!
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { createApp } from 'vue'
+import AdminTeamFolders from './components/AdminTeamFolders.vue'
+
+import 'vite/modulepreload-polyfill'
+
+const app = createApp(AdminTeamFolders)
+app.mount('#vue-admin-team-folders')
diff --git a/src/teams/App.vue b/src/teams/App.vue
index a0ccdff76..97c6096ea 100644
--- a/src/teams/App.vue
+++ b/src/teams/App.vue
@@ -8,12 +8,12 @@ import { storeToRefs } from 'pinia'
 import { onMounted } from 'vue'
 import NcAppContent from '@nextcloud/vue/components/NcAppContent'
 import NcContent from '@nextcloud/vue/components/NcContent'
-import CreateTeamDialog from './components/CreateTeamDialog.vue'
 import GlobalNavigation from './components/GlobalNavigation.vue'
+import TeamCreationWizard from './components/TeamCreationWizard.vue'
 import { useTeamsStore } from './store.ts'
 
 const store = useTeamsStore()
-const { createDialogOpen } = storeToRefs(store)
+const { createWizardOpen } = storeToRefs(store)
 
 onMounted(() => store.loadTeams())
 </script>
@@ -28,7 +28,7 @@ onMounted(() => store.loadTeams())
 			</div>
 		</NcAppContent>
 
-		<CreateTeamDialog v-if="createDialogOpen" @close="createDialogOpen = false" />
+		<TeamCreationWizard v-if="createWizardOpen" @close="createWizardOpen = false" />
 	</NcContent>
 </template>
 
diff --git a/src/teams/api.ts b/src/teams/api.ts
index 5537c6f89..e874692ce 100644
--- a/src/teams/api.ts
+++ b/src/teams/api.ts
@@ -3,11 +3,16 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { Member, Resource, Team, TeamRole } from './types.ts'
+import type { Member, MemberCandidate, Resource, Team, TeamRole } from './types.ts'
 
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import { logger } from '../logger.ts'
+import { SHARES_TYPES_MEMBER_MAP } from './team-page/models/constants.ts'
+import { getRecommendations, getSuggestions } from './team-page/services/collaborationAutocompletion.js'
+
+/** `SHARES_TYPES_MEMBER_MAP` is built dynamically, so type its shape explicitly. */
+const shareTypeToMemberType = SHARES_TYPES_MEMBER_MAP as Record<number, number>
 
 /** OCS endpoints require this header. */
 const HEADERS = { 'OCS-APIRequest': 'true' }
@@ -54,6 +59,15 @@ interface RawDashboardTeam {
 	resources: RawResource[]
 }
 
+/** Raw sharee suggestion, as returned by the files_sharing autocompletion helper. */
+interface RawSuggestion {
+	id: string
+	label: string
+	shareWith: string
+	shareType: number
+	user?: string | null
+}
+
 /**
  * Map a circles member level to a role.
  *
@@ -226,3 +240,98 @@ export async function deleteTeam(teamId: string): Promise<void> {
 		{ headers: HEADERS },
 	)
 }
+
+/**
+ * The team folder linked to a team.
+ */
+export interface TeamFolder {
+	id: number
+	mountPoint: string
+}
+
+/**
+ * Fetch the team folder linked to a team.
+ *
+ * The Circles app exposes the team-folder lifecycle through the core Teams
+ * contract. The active provider is discovered server-side.
+ *
+ * @param teamId - The team single id
+ * @return The linked team folder, or null if none exists.
+ */
+export async function getTeamFolder(teamId: string): Promise<TeamFolder | null> {
+	try {
+		const { data } = await axios.get<OcsResponse<TeamFolder>>(
+			generateOcsUrl('apps/circles/teams/{circleId}/folder', { circleId: teamId }),
+			{ headers: HEADERS },
+		)
+		return data.ocs.data
+	} catch (error) {
+		if (error && typeof error === 'object'
+			&& 'response' in error
+			&& (error.response as { status?: number })?.status === 404) {
+			return null
+		}
+		throw error
+	}
+}
+
+/**
+ * Create a team folder for a team that predates the auto-create feature.
+ *
+ * Idempotent: if the team already owns a folder, the existing folder is
+ * returned. Requires team owner privileges.
+ *
+ * @param teamId - The team single id
+ * @return The created (or existing) team folder.
+ */
+export async function upgradeTeamFolder(teamId: string): Promise<TeamFolder> {
+	const { data } = await axios.post<OcsResponse<{ folderId: number, folder: TeamFolder }>>(
+		generateOcsUrl('apps/circles/teams/{circleId}/folder', { circleId: teamId }),
+		{},
+		{ headers: HEADERS },
+	)
+	return data.ocs.data.folder
+}
+
+/**
+ * Search for potential new members (users, groups, emails, contacts, other
+ * teams…) using the same sharee autocompletion endpoint as file sharing.
+ * This restores the legacy "add members while creating a team" feature for
+ * the team creation wizard.
+ *
+ * @param term - The search query. An empty term returns curated recommendations.
+ */
+export async function searchMemberCandidates(term: string): Promise<MemberCandidate[]> {
+	const suggestions: RawSuggestion[] = term.trim()
+		? await getSuggestions(term)
+		: await getRecommendations()
+
+	return suggestions.map((suggestion) => ({
+		key: suggestion.id,
+		shareWith: suggestion.shareWith,
+		shareType: suggestion.shareType,
+		displayName: suggestion.label,
+		isUser: suggestion.user !== null && suggestion.user !== undefined,
+	}))
+}
+
+/**
+ * Add a batch of picked candidates as members of a team, typically right
+ * after creating it from the wizard.
+ *
+ * @param teamId - The team single id
+ * @param candidates - The candidates picked in the wizard's member step
+ * @return The number of candidates that were actually added.
+ */
+export async function addTeamMembers(teamId: string, candidates: MemberCandidate[]): Promise<number> {
+	const members = candidates.map((candidate) => ({
+		id: candidate.shareWith,
+		type: shareTypeToMemberType[candidate.shareType],
+	}))
+	const res = await axios.post<OcsResponse<Record<string, unknown>>>(
+		generateOcsUrl('apps/circles/circles/{circleId}/members/multi', { circleId: teamId }),
+		{ members },
+		{ headers: HEADERS },
+	)
+	return Object.keys(res.data.ocs.data ?? {}).length
+}
diff --git a/src/teams/components/CreateTeamDialog.vue b/src/teams/components/CreateTeamDialog.vue
deleted file mode 100644
index f2c0e56c8..000000000
--- a/src/teams/components/CreateTeamDialog.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-  - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
-  - SPDX-License-Identifier: AGPL-3.0-or-later
--->
-
-<script setup lang="ts">
-import { showError, showSuccess } from '@nextcloud/dialogs'
-import { t } from '@nextcloud/l10n'
-import { computed, ref } from 'vue'
-import { useRouter } from 'vue-router'
-import NcButton from '@nextcloud/vue/components/NcButton'
-import NcDialog from '@nextcloud/vue/components/NcDialog'
-import NcTextArea from '@nextcloud/vue/components/NcTextArea'
-import NcTextField from '@nextcloud/vue/components/NcTextField'
-import { logger } from '../../logger.ts'
-import { useTeamsStore } from '../store.ts'
-
-const emit = defineEmits<{
-	close: []
-}>()
-
-const router = useRouter()
-const store = useTeamsStore()
-
-const name = ref('')
-const description = ref('')
-const submitting = ref(false)
-
-const canCreate = computed(() => name.value.trim().length > 0 && !submitting.value)
-
-/**
- * Forward a dialog-initiated close (Esc, backdrop, X) so the parent can
- * drop this component.
- *
- * @param value - The new open state from NcDialog
- */
-function onUpdateOpen(value: boolean): void {
-	if (!value) {
-		emit('close')
-	}
-}
-
-/** Create the team, navigate into it and close the dialog. */
-async function submit(): Promise<void> {
-	if (!canCreate.value) {
-		return
-	}
-	submitting.value = true
-	try {
-		const team = await store.createTeam(name.value, description.value)
-		showSuccess(t('circles', 'Team "{name}" created', { name: name.value.trim() }))
-		if (team) {
-			router.push({ name: 'team', params: { teamId: team.id } })
-		}
-		emit('close')
-	} catch (error) {
-		logger.error('Failed to create team', { error })
-		showError(t('circles', 'Could not create the team'))
-	} finally {
-		submitting.value = false
-	}
-}
-</script>
-
-<template>
-	<NcDialog
-		:name="t('circles', 'Create a new team')"
-		size="normal"
-		@update:open="onUpdateOpen">
-		<form class="create-team" @submit.prevent="submit">
-			<NcTextField
-				v-model="name"
-				:label="t('circles', 'Team name')"
-				:placeholder="t('circles', 'e.g. Design')" />
-			<NcTextArea
-				v-model="description"
-				:label="t('circles', 'Description (optional)')"
-				:placeholder="t('circles', 'What is this team about?')"
-				rows="3" />
-		</form>
-
-		<template #actions>
-			<NcButton variant="tertiary" @click="$emit('close')">
-				{{ t('circles', 'Cancel') }}
-			</NcButton>
-			<NcButton
-				variant="primary"
-				:disabled="!canCreate"
-				@click="submit">
-				{{ t('circles', 'Create team') }}
-			</NcButton>
-		</template>
-	</NcDialog>
-</template>
diff --git a/src/teams/components/GlobalNavigation.vue b/src/teams/components/GlobalNavigation.vue
index b0848c6d8..cb5c54ef7 100644
--- a/src/teams/components/GlobalNavigation.vue
+++ b/src/teams/components/GlobalNavigation.vue
@@ -22,7 +22,7 @@ import { useTeamsStore } from '../store.ts'
 
 const store = useTeamsStore()
 const { loading } = storeToRefs(store)
-const { openCreateTeamDialog } = store
+const { openCreateTeamWizard } = store
 
 const route = useRoute()
 const query = ref('')
@@ -39,7 +39,7 @@ const isOverviewActive = computed(() => route.name === 'home')
 		<template #default>
 			<NcAppNavigationNew
 				:text="t('circles', 'New team')"
-				@click="openCreateTeamDialog()">
+				@click="openCreateTeamWizard()">
 				<template #icon>
 					<NcIconSvgWrapper :path="mdiPlus" :size="20" />
 				</template>
diff --git a/src/teams/components/TeamCreationWizard.vue b/src/teams/components/TeamCreationWizard.vue
new file mode 100644
index 000000000..daf23487e
--- /dev/null
+++ b/src/teams/components/TeamCreationWizard.vue
@@ -0,0 +1,336 @@
+<!--
+  - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<script setup lang="ts">
+import type { MemberCandidate } from '../types.ts'
+
+import { mdiAccountMultiplePlusOutline, mdiMagnify } from '@mdi/js'
+import { showError, showSuccess, showWarning } from '@nextcloud/dialogs'
+import { t } from '@nextcloud/l10n'
+import { computed, ref, watch } from 'vue'
+import { useRouter } from 'vue-router'
+import NcButton from '@nextcloud/vue/components/NcButton'
+import NcDialog from '@nextcloud/vue/components/NcDialog'
+import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
+import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
+import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
+import NcTextField from '@nextcloud/vue/components/NcTextField'
+import NcUserBubble from '@nextcloud/vue/components/NcUserBubble'
+import { logger } from '../../logger.ts'
+import { useTeamsStore } from '../store.ts'
+
+/** Minimal shape accepted by `NcDialog`'s `buttons` prop. */
+interface DialogButton {
+	label: string
+	type?: 'button' | 'submit'
+	variant?: 'primary' | 'secondary' | 'tertiary'
+	disabled?: boolean
+	/** Return `false` to keep the dialog open (e.g. to move to the next step). */
+	callback?: () => unknown | false | Promise<unknown | false>
+}
+
+const emit = defineEmits<{
+	close: []
+}>()
+
+const router = useRouter()
+const store = useTeamsStore()
+
+/** The wizard's steps, in order. Kept as data so the template can stay generic. */
+const STEPS = ['name', 'members'] as const
+type WizardStep = typeof STEPS[number]
+
+const open = ref(true)
+const step = ref<WizardStep>('name')
+const submitting = ref(false)
+
+const stepIndex = computed(() => STEPS.indexOf(step.value))
+
+// `NcDialog` owns the `open` model; forward its close (✕ button, escape,
+// backdrop click, "Cancel") to the parent so it can drop this component.
+watch(open, (value) => {
+	if (!value) {
+		emit('close')
+	}
+})
+
+// --- Step 1: team name ------------------------------------------------------
+
+const name = ref('')
+const nameTouched = ref(false)
+const isNameValid = computed(() => name.value.trim().length > 0)
+const nameError = computed(() => (nameTouched.value && !isNameValid.value
+	? t('circles', 'Please enter a team name')
+	: ''))
+
+// --- Step 2: initial member selection (restored legacy feature) ------------
+
+const searchQuery = ref('')
+const searching = ref(false)
+const candidates = ref<MemberCandidate[]>([])
+const selectedMembers = ref<Map<string, MemberCandidate>>(new Map())
+const selectedList = computed(() => Array.from(selectedMembers.value.values()))
+
+let searchTimeout: ReturnType<typeof setTimeout> | undefined
+
+/**
+ * Debounce the sharee search so we don't hit the API on every keystroke.
+ *
+ * @param term - The search query
+ */
+function scheduleSearch(term: string): void {
+	clearTimeout(searchTimeout)
+	searchTimeout = setTimeout(async () => {
+		searching.value = true
+		try {
+			candidates.value = await store.searchMemberCandidates(term)
+		} catch (error) {
+			logger.error('Failed to search for members', { error })
+		} finally {
+			searching.value = false
+		}
+	}, 300)
+}
+
+watch(searchQuery, (term) => scheduleSearch(term))
+
+/**
+ * Toggle a candidate in/out of the current selection.
+ *
+ * @param candidate - The candidate to toggle
+ */
+function toggleCandidate(candidate: MemberCandidate): void {
+	const next = new Map(selectedMembers.value)
+	if (next.has(candidate.key)) {
+		next.delete(candidate.key)
+	} else {
+		next.set(candidate.key, candidate)
+	}
+	selectedMembers.value = next
+}
+
+/**
+ * Whether a candidate is currently part of the selection.
+ *
+ * @param candidate - The candidate to check
+ */
+function isSelected(candidate: MemberCandidate): boolean {
+	return selectedMembers.value.has(candidate.key)
+}
+
+// --- Wizard navigation / submission -----------------------------------------
+
+/**
+ * Advance from the name step to the member step, validating the name first.
+ * Always returns `false` so the dialog stays open (this is a "Next" action).
+ */
+function goToMembers(): false {
+	if (!isNameValid.value) {
+		nameTouched.value = true
+		return false
+	}
+	step.value = 'members'
+	scheduleSearch(searchQuery.value)
+	return false
+}
+
+/**
+ * Move back to the name step. Always returns `false` so the dialog stays open.
+ */
+function goToName(): false {
+	step.value = 'name'
+	return false
+}
+
+/**
+ * Create the team, add any picked members and navigate in. Returns `false` to
+ * keep the dialog open on failure so the user can retry; on success it
+ * closes the dialog itself (the `open` watcher then notifies the parent).
+ */
+async function createTeam(): Promise<false | void> {
+	if (!isNameValid.value || submitting.value) {
+		return false
+	}
+
+	submitting.value = true
+	try {
+		const team = await store.createTeam(name.value)
+		if (!team) {
+			throw new Error('Team creation did not return a team')
+		}
+
+		if (selectedList.value.length > 0) {
+			try {
+				const added = await store.addTeamMembers(team.id, selectedList.value)
+				if (added < selectedList.value.length) {
+					showWarning(t('circles', 'Some members could not be added to the team'))
+				}
+			} catch (error) {
+				logger.error('Failed to add initial members', { error })
+				showWarning(t('circles', 'Team created, but the initial members could not be added'))
+			}
+		}
+
+		showSuccess(t('circles', 'Team "{name}" created', { name: name.value.trim() }))
+		router.push({ name: 'team', params: { teamId: team.id } })
+		open.value = false
+	} catch (error) {
+		logger.error('Failed to create team', { error })
+		showError(t('circles', 'Could not create the team'))
+		return false
+	} finally {
+		submitting.value = false
+	}
+}
+
+/** The dialog's footer buttons, adapted to the current step. */
+const buttons = computed<DialogButton[]>(() => {
+	const cancelButton: DialogButton = {
+		label: t('circles', 'Cancel'),
+		disabled: submitting.value,
+	}
+
+	if (step.value === 'name') {
+		return [
+			cancelButton,
+			{
+				label: t('circles', 'Next'),
+				type: 'submit',
+				variant: 'primary',
+				callback: goToMembers,
+			},
+		]
+	}
+
+	return [
+		{
+			label: t('circles', 'Back'),
+			disabled: submitting.value,
+			callback: goToName,
+		},
+		cancelButton,
+		{
+			label: t('circles', 'Create team'),
+			type: 'submit',
+			variant: 'primary',
+			callback: createTeam,
+		},
+	]
+})
+
+/** Handle the form's native submit event (e.g. pressing enter in the name field). */
+function onFormSubmit(): void {
+	if (step.value === 'name') {
+		goToMembers()
+	} else {
+		createTeam()
+	}
+}
+</script>
+
+<template>
+	<NcDialog
+		v-model:open="open"
+		isForm
+		size="normal"
+		:name="t('circles', 'Create a new team')"
+		:buttons="buttons"
+		@submit="onFormSubmit">
+		<div class="team-wizard">
+			<p class="team-wizard__step-indicator">
+				{{ t('circles', 'Step {current} of {total}', { current: stepIndex + 1, total: STEPS.length }) }}
+			</p>
+
+			<!-- Step 1: team name -->
+			<section v-if="step === 'name'" class="team-wizard__step">
+				<h3>{{ t('circles', 'Name your team') }}</h3>
+				<NcTextField
+					v-model="name"
+					:label="t('circles', 'Team name')"
+					:error="!!nameError"
+					:helperText="nameError"
+					:placeholder="t('circles', 'e.g. Design')" />
+			</section>
+
+			<!-- Step 2: initial member selection -->
+			<section v-else-if="step === 'members'" class="team-wizard__step">
+				<h3>{{ t('circles', 'Add initial members') }}</h3>
+				<NcTextField
+					v-model="searchQuery"
+					:label="t('circles', 'Search people, groups, teams…')"
+					:placeholder="t('circles', 'Optional, you can also add members later')"
+					@keydown.enter.prevent>
+					<template #icon>
+						<NcIconSvgWrapper :path="mdiMagnify" :size="20" />
+					</template>
+				</NcTextField>
+
+				<ul v-if="selectedList.length > 0" class="team-wizard__selection">
+					<li v-for="candidate in selectedList" :key="candidate.key">
+						<NcUserBubble
+							:displayName="candidate.displayName"
+							:user="candidate.isUser ? candidate.shareWith : undefined"
+							@click="toggleCandidate(candidate)" />
+					</li>
+				</ul>
+
+				<NcLoadingIcon v-if="searching" :size="32" />
+				<NcEmptyContent
+					v-else-if="candidates.length === 0"
+					:name="t('circles', 'Search for people to add')"
+					:description="t('circles', 'You can always add or remove members later from the team page.')">
+					<template #icon>
+						<NcIconSvgWrapper :path="mdiAccountMultiplePlusOutline" />
+					</template>
+				</NcEmptyContent>
+				<ul v-else class="team-wizard__results">
+					<li v-for="candidate in candidates" :key="candidate.key">
+						<NcButton
+							:variant="isSelected(candidate) ? 'primary' : 'tertiary'"
+							@click="toggleCandidate(candidate)">
+							{{ candidate.displayName }}
+						</NcButton>
+					</li>
+				</ul>
+			</section>
+		</div>
+	</NcDialog>
+</template>
+
+<style scoped lang="scss">
+.team-wizard {
+	display: flex;
+	flex-direction: column;
+	gap: calc(3 * var(--default-grid-baseline));
+	box-sizing: border-box;
+	min-height: 280px;
+
+	&__step-indicator {
+		margin: 0;
+		color: var(--color-text-maxcontrast);
+	}
+
+	&__step {
+		display: flex;
+		flex: 1 1 auto;
+		flex-direction: column;
+		gap: calc(2 * var(--default-grid-baseline));
+
+		h3 {
+			margin: 0;
+		}
+	}
+
+	&__selection,
+	&__results {
+		display: flex;
+		flex-wrap: wrap;
+		gap: calc(2 * var(--default-grid-baseline));
+		margin: 0;
+		padding: 0;
+		list-style: none;
+	}
+}
+</style>
diff --git a/src/teams/components/TeamFolderWidget.vue b/src/teams/components/TeamFolderWidget.vue
new file mode 100644
index 000000000..021436c80
--- /dev/null
+++ b/src/teams/components/TeamFolderWidget.vue
@@ -0,0 +1,595 @@
+<!--
+  - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<script setup lang="ts">
+import { mdiFileOutline, mdiFolderOutline, mdiOpenInNew, mdiViewGridOutline, mdiViewListOutline } from '@mdi/js'
+import { showError } from '@nextcloud/dialogs'
+import { FileType, formatFileSize } from '@nextcloud/files'
+import { defaultRootPath, getClient, getDefaultPropfind, resultToNode } from '@nextcloud/files/dav'
+import { t } from '@nextcloud/l10n'
+import { generateUrl } from '@nextcloud/router'
+import { computed, ref, watch } from 'vue'
+import NcButton from '@nextcloud/vue/components/NcButton'
+import NcDateTime from '@nextcloud/vue/components/NcDateTime'
+import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
+import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
+import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
+import { logger } from '../../logger.ts'
+
+/**
+ * Minimal node shape needed by the widget.
+ *
+ * The `@nextcloud/files` Node class exposes the same public interface, but
+ * TypeScript requires us to keep the private fields when using the class
+ * type directly. Using our own interface keeps the template code simple.
+ */
+interface TeamFolderNode {
+	source: string
+	basename: string
+	displayname: string
+	type: FileType
+	mime?: string
+	size?: number
+	mtime?: Date
+	fileid?: number
+	attributes: Record<string, unknown>
+}
+
+const props = defineProps<{
+	mountPoint: string
+	rootFolderId?: number
+	folderPath?: string
+}>()
+
+const emit = defineEmits<{
+	(e: 'update:folderPath', path: string): void
+}>()
+
+const client = getClient()
+const rootPath = defaultRootPath
+
+const currentPath = ref(props.folderPath ?? '')
+const nodes = ref<TeamFolderNode[]>([])
+const currentFolderFileId = ref<number | undefined>(props.rootFolderId)
+const loading = ref(false)
+const error = ref<string | null>(null)
+const viewMode = ref<'grid' | 'list'>('grid')
+
+/**
+ * Build the breadcrumb trail from the team folder mount point and the
+ * current sub path.
+ */
+const breadcrumbs = computed(() => {
+	const crumbs = [{ name: props.mountPoint, path: '' }]
+	if (!currentPath.value) {
+		return crumbs
+	}
+
+	const parts = currentPath.value.split('/').filter(Boolean)
+	let built = ''
+	for (const part of parts) {
+		built += '/' + part
+		crumbs.push({ name: part, path: built.slice(1) })
+	}
+	return crumbs
+})
+
+/**
+ * Toggle between grid and list view.
+ */
+function toggleViewMode(): void {
+	viewMode.value = viewMode.value === 'grid' ? 'list' : 'grid'
+}
+
+/**
+ * Build the directory path for the current folder inside the team folder.
+ */
+const currentDir = computed(() => currentPath.value
+	? `/${props.mountPoint}/${currentPath.value}`
+	: `/${props.mountPoint}`)
+
+/**
+ * URL that opens the current folder in the Files app.
+ *
+ * The Files app accepts file id 0 when the target is a folder; the actual
+ * folder path is taken from the `dir` query parameter.
+ */
+const currentFolderUrl = computed(() => {
+	const fileid = currentFolderFileId.value ?? 0
+	const url = generateUrl('/apps/files/files/{fileid}', { fileid })
+	return `${url}?dir=${encodeDir(currentDir.value)}`
+})
+
+/**
+ * Encode a directory path for a query parameter while keeping slashes readable.
+ *
+ * The Files app uses literal `/` characters in its `dir` query parameter, so
+ * we encode everything else (spaces, etc.) but leave path separators alone.
+ *
+ * @param dir - The directory path
+ */
+function encodeDir(dir: string): string {
+	return encodeURIComponent(dir).replace(/%2F/g, '/')
+}
+
+/**
+ * Build the URL for a single node so the list items are real links.
+ *
+ * Both files and folders open in the Files app using the file id based URL
+ * that the Files app itself uses for navigation.
+ *
+ * @param node - The team folder node
+ */
+function getNodeUrl(node: TeamFolderNode): string {
+	const dir = node.type === FileType.Folder
+		? `${currentDir.value}/${node.basename}`
+		: currentDir.value
+	const url = generateUrl('/apps/files/files/{fileid}', {
+		fileid: node.fileid,
+	})
+	const openFile = node.type === FileType.File ? '&openfile=true' : ''
+	return `${url}?dir=${encodeDir(dir)}${openFile}`
+}
+
+/**
+ * Return the icon path for the given node type.
+ *
+ * @param node - The team folder node
+ */
+function nodeIconPath(node: TeamFolderNode): string {
+	return node.type === FileType.Folder ? mdiFolderOutline : mdiFileOutline
+}
+
+/**
+ * Return the preview image URL for a file node, mimicking the Files app.
+ *
+ * @param node - The team folder node
+ * @param size - The preview size in pixels
+ */
+function nodePreviewUrl(node: TeamFolderNode, size = 128): string | undefined {
+	if (node.type === FileType.Folder) {
+		return undefined
+	}
+
+	const hasPreview = node.attributes['has-preview'] === true
+	const mime = node.mime
+	if (!hasPreview && mime && mime !== 'application/octet-stream') {
+		const url = new URL(window.location.origin + generateUrl('/core/mimeicon?mime={mime}', { mime }))
+		return url.href
+	}
+
+	const previewUrl = (node.attributes.previewUrl as string | undefined)
+		|| generateUrl('/core/preview?fileId={fileid}', { fileid: String(node.fileid) })
+	const url = new URL(window.location.origin + previewUrl)
+	url.searchParams.set('x', size.toString())
+	url.searchParams.set('y', size.toString())
+	url.searchParams.set('mimeFallback', 'true')
+	url.searchParams.set('v', ((node.attributes.etag as string | undefined) || node.mtime?.getTime() || '').toString().slice(0, 6))
+	url.searchParams.set('a', '0')
+	return url.href
+}
+
+/**
+ * Handle a click on a node.
+ *
+ * Folders are navigated inside the widget. Files use the real link href
+ * to open in the Files app, so we do not intercept those clicks.
+ *
+ * @param node - The team folder node
+ * @param event - The click event
+ */
+function onNodeClick(node: TeamFolderNode, event: MouseEvent): void {
+	if (node.type !== FileType.Folder) {
+		return
+	}
+
+	event.preventDefault()
+	const newPath = currentPath.value
+		? `${currentPath.value}/${node.basename}`
+		: node.basename
+	navigateTo(newPath)
+}
+
+/**
+ * Navigate the widget to a specific breadcrumb path.
+ *
+ * @param path - The relative path inside the team folder
+ */
+function navigateTo(path: string): void {
+	currentPath.value = path
+	emit('update:folderPath', path)
+}
+
+/**
+ * Load the contents of the current folder via WebDAV.
+ */
+async function loadContents(): Promise<void> {
+	loading.value = true
+	error.value = null
+	nodes.value = []
+
+	const relativePath = currentPath.value
+		? `${props.mountPoint}/${currentPath.value}`
+		: props.mountPoint
+	const davPath = `${rootPath}/${relativePath}`
+
+	try {
+		const response = await client.getDirectoryContents(davPath, {
+			details: true,
+			data: getDefaultPropfind(),
+			includeSelf: true,
+		})
+		const data = Array.isArray(response) ? response : response.data
+
+		if (!Array.isArray(data)) {
+			throw new Error('Invalid response from server')
+		}
+
+		// The first entry is the current directory itself. Use its file id
+		// for the "Open in Files" header button, because the GroupFolders
+		// folder id is not the same as the DAV file id.
+		const currentEntry = data[0]
+		if (currentEntry) {
+			const currentNode = resultToNode(currentEntry, rootPath) as TeamFolderNode
+			currentFolderFileId.value = currentNode.fileid ?? props.rootFolderId
+		}
+
+		nodes.value = data
+			.slice(1)
+			.map((entry) => {
+				const node = resultToNode(entry, rootPath) as TeamFolderNode
+				// resultToNode returns a @nextcloud/files Node instance whose
+				// `attributes` property is read-only, so build a plain object.
+				return {
+					source: node.source,
+					basename: node.basename,
+					displayname: node.displayname,
+					type: node.type,
+					mime: node.mime,
+					size: node.size,
+					mtime: node.mtime,
+					fileid: node.fileid,
+					attributes: entry.props ? { ...entry.props } : {},
+				} as TeamFolderNode
+			})
+			.sort((a, b) => {
+				if (a.type === b.type) {
+					return a.basename.localeCompare(b.basename)
+				}
+				return a.type === FileType.Folder ? -1 : 1
+			})
+	} catch (err) {
+		const status = (err as { status?: number })?.status
+		// A 404 on the team folder root likely means the folder is empty and
+		// has not been physically created by GroupFolders yet. Show the empty
+		// state instead of an error in that case.
+		if (status === 404 && currentPath.value === '') {
+			nodes.value = []
+		} else {
+			logger.error('Could not load team folder contents', { err, path: davPath })
+			error.value = t('circles', 'Could not load folder contents')
+			showError(error.value)
+		}
+	} finally {
+		loading.value = false
+	}
+}
+
+watch(() => props.folderPath, (path) => {
+	currentPath.value = path ?? ''
+}, { immediate: true })
+
+watch(() => [props.mountPoint, currentPath.value], loadContents, { immediate: true })
+</script>
+
+<template>
+	<div class="team-folder-widget">
+		<div class="team-folder-widget__header">
+			<nav
+				class="team-folder-widget__breadcrumbs"
+				:aria-label="t('circles', 'Team space breadcrumbs')">
+				<ol class="team-folder-widget__breadcrumbs-list">
+					<li
+						v-for="(crumb, index) in breadcrumbs"
+						:key="crumb.path"
+						class="team-folder-widget__breadcrumbs-item">
+						<NcButton
+							v-if="index < breadcrumbs.length - 1"
+							variant="tertiary"
+							size="small"
+							@click="navigateTo(crumb.path)">
+							{{ crumb.name }}
+						</NcButton>
+						<span
+							v-else
+							class="team-folder-widget__breadcrumbs-current"
+							aria-current="location">
+							{{ crumb.name }}
+						</span>
+						<span
+							v-if="index < breadcrumbs.length - 1"
+							class="team-folder-widget__breadcrumbs-separator"
+							aria-hidden="true">
+							/
+						</span>
+					</li>
+				</ol>
+			</nav>
+
+			<div class="team-folder-widget__actions">
+				<NcButton
+					variant="tertiary"
+					size="small"
+					:aria-label="viewMode === 'grid' ? t('circles', 'Switch to list view') : t('circles', 'Switch to grid view')"
+					@click="toggleViewMode">
+					<template #icon>
+						<NcIconSvgWrapper :path="viewMode === 'grid' ? mdiViewListOutline : mdiViewGridOutline" :size="18" />
+					</template>
+				</NcButton>
+				<NcButton
+					:href="currentFolderUrl"
+					variant="tertiary"
+					size="small"
+					:aria-label="t('circles', 'Open folder in Files')">
+					<template #icon>
+						<NcIconSvgWrapper :path="mdiOpenInNew" :size="18" />
+					</template>
+					{{ t('circles', 'Files') }}
+				</NcButton>
+			</div>
+		</div>
+
+		<div v-if="loading" class="team-folder-widget__loading">
+			<NcLoadingIcon :size="44" />
+		</div>
+
+		<NcEmptyContent
+			v-else-if="error"
+			:name="t('circles', 'Folder contents unavailable')"
+			:description="error" />
+
+		<NcEmptyContent
+			v-else-if="nodes.length === 0"
+			:name="t('circles', 'Empty folder')"
+			:description="t('circles', 'This team space is empty.')" />
+
+		<ul
+			v-else
+			class="team-folder-widget__list"
+			:class="{ 'team-folder-widget__list--grid': viewMode === 'grid' }"
+			:aria-label="t('circles', 'Folder contents')">
+			<li
+				v-for="node in nodes"
+				:key="node.source"
+				class="team-folder-widget__item"
+				:class="{ 'team-folder-widget__item--folder': node.type === FileType.Folder }">
+				<a
+					class="team-folder-widget__tile"
+					:class="{ 'team-folder-widget__tile--list': viewMode === 'list' }"
+					:href="getNodeUrl(node)"
+					@click="onNodeClick(node, $event)">
+					<div class="team-folder-widget__tile-preview">
+						<img
+							v-if="nodePreviewUrl(node, 64) && viewMode === 'grid'"
+							:src="nodePreviewUrl(node, 64)"
+							:alt="t('circles', 'Preview of {name}', { name: node.basename })"
+							loading="lazy"
+							class="team-folder-widget__preview">
+						<NcIconSvgWrapper
+							v-else
+							class="team-folder-widget__tile-icon"
+							:path="nodeIconPath(node)"
+							:size="viewMode === 'grid' ? 32 : 20" />
+					</div>
+					<div class="team-folder-widget__tile-info">
+						<span class="team-folder-widget__tile-name" :title="node.displayname || node.basename">
+							{{ node.displayname || node.basename }}
+						</span>
+						<span class="team-folder-widget__tile-meta">
+							<span v-if="node.type === FileType.Folder" class="team-folder-widget__tile-type">
+								{{ t('circles', 'Folder') }}
+							</span>
+							<span v-else-if="node.size !== undefined" class="team-folder-widget__tile-size">
+								{{ formatFileSize(node.size) }}
+							</span>
+							<span v-if="node.mtime" class="team-folder-widget__tile-mtime">
+								<NcDateTime :timestamp="node.mtime" :relativeTime="false" ignoreSeconds />
+							</span>
+						</span>
+					</div>
+				</a>
+			</li>
+		</ul>
+	</div>
+</template>
+
+<style lang="scss" scoped>
+.team-folder-widget {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+
+	&__header {
+		flex: 0 0 auto;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		gap: 8px;
+		padding: 8px 16px;
+		border-bottom: 1px solid var(--color-border);
+	}
+
+	&__breadcrumbs {
+		flex: 1 1 auto;
+		min-width: 0;
+	}
+
+	&__breadcrumbs-list {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: 4px;
+		margin: 0;
+		padding: 0;
+		list-style: none;
+	}
+
+	&__breadcrumbs-item {
+		display: flex;
+		align-items: center;
+		gap: 4px;
+	}
+
+	&__breadcrumbs-current {
+		padding: 4px 8px;
+		font-weight: bold;
+	}
+
+	&__breadcrumbs-separator {
+		color: var(--color-text-maxcontrast);
+	}
+
+	&__loading {
+		flex: 1 1 auto;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	&__actions {
+		display: flex;
+		align-items: center;
+		gap: 4px;
+		flex-shrink: 0;
+	}
+
+	&__list {
+		flex: 1 1 auto;
+		overflow-y: auto;
+		margin: 0;
+		padding: 0;
+		list-style: none;
+	}
+
+	&__list--grid {
+		display: grid;
+		grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
+		gap: calc(2 * var(--default-grid-baseline));
+		padding: calc(2 * var(--default-grid-baseline));
+		align-content: start;
+	}
+
+	&__list--grid &__item {
+		width: 100%;
+	}
+
+	&__tile {
+		display: flex;
+		flex-direction: column;
+		gap: calc(2 * var(--default-grid-baseline));
+		padding: calc(2 * var(--default-grid-baseline));
+		border: 2px solid var(--color-border);
+		border-radius: var(--border-radius-container, 16px);
+		background-color: var(--color-main-background);
+		color: var(--color-main-text);
+		text-decoration: none;
+
+		&:hover {
+			background-color: var(--color-background-hover);
+			border-color: var(--color-primary-element);
+		}
+
+		&:focus-visible {
+			outline: 2px solid var(--color-main-text);
+			outline-offset: 2px;
+		}
+
+		&--list {
+			flex-direction: row;
+			align-items: center;
+			gap: calc(2 * var(--default-grid-baseline));
+			padding: calc(1.5 * var(--default-grid-baseline)) calc(2 * var(--default-grid-baseline));
+			border-width: 0 0 1px 0;
+			border-radius: 0;
+
+			&:hover {
+				background-color: var(--color-background-hover);
+			}
+		}
+	}
+
+	&__tile-preview {
+		aspect-ratio: 1 / 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		overflow: hidden;
+		border-radius: var(--border-radius-large);
+		background-color: var(--color-background-dark);
+		flex-shrink: 0;
+		width: 100%;
+		height: auto;
+
+		.team-folder-widget__tile--list & {
+			width: 32px;
+			height: 32px;
+			border-radius: var(--border-radius);
+			background-color: transparent;
+		}
+	}
+
+	&__tile-icon {
+		color: var(--color-text-maxcontrast);
+	}
+
+	&__preview {
+		width: 100%;
+		height: 100%;
+		object-fit: cover;
+	}
+
+	&__tile-info {
+		display: flex;
+		flex-direction: column;
+		gap: var(--default-grid-baseline);
+		min-width: 0;
+		width: 100%;
+
+		.team-folder-widget__tile--list & {
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			gap: calc(2 * var(--default-grid-baseline));
+		}
+	}
+
+	&__tile-name {
+		font-weight: 600;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		flex: 1 1 auto;
+		min-width: 0;
+	}
+
+	&__tile-meta {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 0 calc(2 * var(--default-grid-baseline));
+		color: var(--color-text-maxcontrast);
+		font-size: 0.9em;
+		flex-shrink: 0;
+
+		.team-folder-widget__tile--list & {
+			justify-content: flex-end;
+			min-width: 140px;
+		}
+	}
+
+	&__tile-mtime {
+		white-space: nowrap;
+	}
+}
+</style>
diff --git a/src/teams/components/TeamHeader.vue b/src/teams/components/TeamHeader.vue
new file mode 100644
index 000000000..1d3752718
--- /dev/null
+++ b/src/teams/components/TeamHeader.vue
@@ -0,0 +1,115 @@
+<!--
+  - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<script setup lang="ts">
+import type Circle from '../team-page/models/circle.ts'
+
+import { mdiCogOutline, mdiContentCopy, mdiExitToApp, mdiTrashCanOutline } from '@mdi/js'
+import { t } from '@nextcloud/l10n'
+import { computed } from 'vue'
+import NcActionButton from '@nextcloud/vue/components/NcActionButton'
+import NcActions from '@nextcloud/vue/components/NcActions'
+import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
+import NcUserBubble from '@nextcloud/vue/components/NcUserBubble'
+import TeamAvatar from './TeamAvatar.vue'
+import { useTeamActions } from '../composables/useTeamActions.ts'
+import { useTeamsStore } from '../store.ts'
+
+const props = defineProps<{
+	circle: Circle
+}>()
+
+const store = useTeamsStore()
+const team = computed(() => store.getTeam(props.circle.id))
+
+const { canManage, canLeave, canDelete, onManage, onCopyLink, onLeave, onDelete } = useTeamActions(() => team.value)
+</script>
+
+<template>
+	<div class="team-header">
+		<TeamAvatar :displayName="circle.displayName" :size="48" />
+		<div class="team-header__info">
+			<h2 class="team-header__name" :title="circle.displayName">
+				{{ circle.displayName }}
+			</h2>
+			<div class="team-header__owner">
+				<span>{{ t('circles', 'Team owner') }}</span>
+				<NcUserBubble
+					:user="circle.owner.userId"
+					:displayName="circle.isOwner ? t('circles', 'you') : circle.owner.displayName" />
+			</div>
+		</div>
+
+		<NcActions v-if="team && canManage" class="team-header__actions" :aria-label="t('circles', 'Team actions')">
+			<template #icon>
+				<NcIconSvgWrapper :path="mdiCogOutline" :size="20" />
+			</template>
+
+			<NcActionButton closeAfterClick @click="onManage">
+				<template #icon>
+					<NcIconSvgWrapper :path="mdiCogOutline" :size="20" />
+				</template>
+				{{ t('circles', 'Manage team') }}
+			</NcActionButton>
+
+			<NcActionButton closeAfterClick @click="onCopyLink">
+				<template #icon>
+					<NcIconSvgWrapper :path="mdiContentCopy" :size="20" />
+				</template>
+				{{ t('circles', 'Copy link') }}
+			</NcActionButton>
+
+			<NcActionButton v-if="canLeave" closeAfterClick @click="onLeave">
+				<template #icon>
+					<NcIconSvgWrapper :path="mdiExitToApp" :size="20" />
+				</template>
+				{{ t('circles', 'Leave team') }}
+			</NcActionButton>
+
+			<NcActionButton v-if="canDelete" closeAfterClick @click="onDelete">
+				<template #icon>
+					<NcIconSvgWrapper :path="mdiTrashCanOutline" :size="20" />
+				</template>
+				{{ t('circles', 'Delete team') }}
+			</NcActionButton>
+		</NcActions>
+	</div>
+</template>
+
+<style lang="scss" scoped>
+.team-header {
+	display: flex;
+	align-items: center;
+	gap: 16px;
+	padding: 20px;
+
+	&__info {
+		display: flex;
+		flex-direction: column;
+		gap: 2px;
+		min-width: 0;
+	}
+
+	&__name {
+		font-size: 1.5rem;
+		font-weight: bold;
+		margin: 0;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	&__owner {
+		display: flex;
+		align-items: center;
+		gap: 4px;
+		color: var(--color-text-maxcontrast);
+	}
+
+	&__actions {
+		margin-inline-start: auto;
+	}
+}
+</style>
diff --git a/src/teams/components/TeamNavigationItem.vue b/src/teams/components/TeamNavigationItem.vue
index 3cf701516..af9544c4b 100644
--- a/src/teams/components/TeamNavigationItem.vue
+++ b/src/teams/components/TeamNavigationItem.vue
@@ -7,96 +7,21 @@
 import type { Team } from '../types.ts'
 
 import { mdiCogOutline, mdiContentCopy, mdiExitToApp, mdiTrashCanOutline } from '@mdi/js'
-import { showConfirmation, showError, showSuccess } from '@nextcloud/dialogs'
-import { emit } from '@nextcloud/event-bus'
 import { t } from '@nextcloud/l10n'
 import { computed } from 'vue'
-import { useRouter } from 'vue-router'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import NcAppNavigationItem from '@nextcloud/vue/components/NcAppNavigationItem'
 import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
 import TeamAvatar from './TeamAvatar.vue'
-import { logger } from '../../logger.ts'
-import { useTeamsStore } from '../store.ts'
+import { useTeamActions } from '../composables/useTeamActions.ts'
 
 const props = defineProps<{
 	team: Team
 }>()
 
-const router = useRouter()
-const store = useTeamsStore()
-
 const to = computed(() => ({ name: 'team', params: { teamId: props.team.id } }))
-const isOwner = computed(() => props.team.myRole === 'owner')
-const canManage = computed(() => ['owner', 'admin', 'moderator'].includes(props.team.myRole))
-const canLeave = computed(() => !isOwner.value)
-const canDelete = computed(() => isOwner.value)
-
-/** Open the team and trigger its member picker (same as Contacts "Manage team"). */
-async function onManage(): Promise<void> {
-	await router.push(to.value)
-	emit('contacts:circles:append', props.team.id)
-}
-
-/** Copy a direct link to the team. */
-async function onCopyLink(): Promise<void> {
-	const href = window.location.origin + router.resolve(to.value).href
-	try {
-		await navigator.clipboard.writeText(href)
-		showSuccess(t('circles', 'Link copied to the clipboard'))
-	} catch (error) {
-		logger.error('Could not copy link', { error })
-		showError(t('circles', 'Could not copy link to the clipboard'))
-	}
-}
-
-/** Leave the team after confirmation. */
-async function onLeave(): Promise<void> {
-	const confirmed = await showConfirmation({
-		name: t('circles', 'Leave team'),
-		text: t('circles', 'Are you sure you want to leave {team}?', { team: props.team.displayName }),
-		labelConfirm: t('circles', 'Leave team'),
-		labelReject: t('circles', 'Cancel'),
-		severity: 'warning',
-	})
-	if (!confirmed) {
-		return
-	}
-	try {
-		await store.leaveTeam(props.team.id)
-		showSuccess(t('circles', 'You left "{name}"', { name: props.team.displayName }))
-		if (router.currentRoute.value.params.teamId === props.team.id) {
-			router.push({ name: 'home' })
-		}
-	} catch (error) {
-		logger.error('Could not leave the team', { error })
-		showError(t('circles', 'Could not leave the team'))
-	}
-}
 
-/** Delete the team after confirmation. */
-async function onDelete(): Promise<void> {
-	const confirmed = await showConfirmation({
-		name: t('circles', 'Delete team'),
-		text: t('circles', 'Are you sure you want to delete {team}? This cannot be undone.', { team: props.team.displayName }),
-		labelConfirm: t('circles', 'Delete team'),
-		labelReject: t('circles', 'Cancel'),
-		severity: 'error',
-	})
-	if (!confirmed) {
-		return
-	}
-	try {
-		await store.deleteTeam(props.team.id)
-		showSuccess(t('circles', 'Team deleted'))
-		if (router.currentRoute.value.params.teamId === props.team.id) {
-			router.push({ name: 'home' })
-		}
-	} catch (error) {
-		logger.error('Could not delete the team', { error })
-		showError(t('circles', 'Could not delete the team'))
-	}
-}
+const { canManage, canLeave, canDelete, onManage, onCopyLink, onLeave, onDelete } = useTeamActions(() => props.team)
 </script>
 
 <template>
diff --git a/src/teams/composables/useTeamActions.ts b/src/teams/composables/useTeamActions.ts
new file mode 100644
index 000000000..c10018266
--- /dev/null
+++ b/src/teams/composables/useTeamActions.ts
@@ -0,0 +1,122 @@
+/*!
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import type { Team } from '../types.ts'
+
+import { showConfirmation, showError, showSuccess } from '@nextcloud/dialogs'
+import { t } from '@nextcloud/l10n'
+import { computed } from 'vue'
+import { useRouter } from 'vue-router'
+import { logger } from '../../logger.ts'
+import { useTeamsStore } from '../store.ts'
+
+/**
+ * Team-level actions (manage/copy link/leave/delete) shared between the
+ * sidebar navigation item's context menu and the dashboard's admin actions
+ * menu.
+ *
+ * @param getTeam a getter returning the team the actions apply to (may be
+ * undefined while it is still loading)
+ */
+export function useTeamActions(getTeam: () => Team | undefined) {
+	const router = useRouter()
+	const store = useTeamsStore()
+
+	const to = computed(() => ({ name: 'team', params: { teamId: getTeam()?.id } }))
+	const settingsTo = computed(() => ({ name: 'team-settings', params: { teamId: getTeam()?.id } }))
+	const isOwner = computed(() => getTeam()?.myRole === 'owner')
+	const canManage = computed(() => {
+		const team = getTeam()
+		return !!team && ['owner', 'admin', 'moderator'].includes(team.myRole)
+	})
+	const canLeave = computed(() => !!getTeam() && !isOwner.value)
+	const canDelete = computed(() => isOwner.value)
+
+	/** Open the team's Settings page. */
+	async function onManage(): Promise<void> {
+		await router.push(settingsTo.value)
+	}
+
+	/** Copy a direct link to the team. */
+	async function onCopyLink(): Promise<void> {
+		const href = window.location.origin + router.resolve(to.value).href
+		try {
+			await navigator.clipboard.writeText(href)
+			showSuccess(t('circles', 'Link copied to the clipboard'))
+		} catch (error) {
+			logger.error('Could not copy link', { error })
+			showError(t('circles', 'Could not copy link to the clipboard'))
+		}
+	}
+
+	/** Leave the team after confirmation. */
+	async function onLeave(): Promise<void> {
+		const team = getTeam()
+		if (!team) {
+			return
+		}
+		const confirmed = await showConfirmation({
+			name: t('circles', 'Leave team'),
+			text: t('circles', 'Are you sure you want to leave {team}?', { team: team.displayName }),
+			labelConfirm: t('circles', 'Leave team'),
+			labelReject: t('circles', 'Cancel'),
+			severity: 'warning',
+		})
+		if (!confirmed) {
+			return
+		}
+		try {
+			await store.leaveTeam(team.id)
+			showSuccess(t('circles', 'You left "{name}"', { name: team.displayName }))
+			if (router.currentRoute.value.params.teamId === team.id) {
+				router.push({ name: 'home' })
+			}
+		} catch (error) {
+			logger.error('Could not leave the team', { error })
+			showError(t('circles', 'Could not leave the team'))
+		}
+	}
+
+	/** Delete the team after confirmation. */
+	async function onDelete(): Promise<void> {
+		const team = getTeam()
+		if (!team) {
+			return
+		}
+		const confirmed = await showConfirmation({
+			name: t('circles', 'Delete team'),
+			text: t('circles', 'Are you sure you want to delete {team}? This cannot be undone.', { team: team.displayName }),
+			labelConfirm: t('circles', 'Delete team'),
+			labelReject: t('circles', 'Cancel'),
+			severity: 'error',
+		})
+		if (!confirmed) {
+			return
+		}
+		try {
+			await store.deleteTeam(team.id)
+			showSuccess(t('circles', 'Team deleted'))
+			if (router.currentRoute.value.params.teamId === team.id) {
+				router.push({ name: 'home' })
+			}
+		} catch (error) {
+			logger.error('Could not delete the team', { error })
+			showError(t('circles', 'Could not delete the team'))
+		}
+	}
+
+	return {
+		to,
+		settingsTo,
+		isOwner,
+		canManage,
+		canLeave,
+		canDelete,
+		onManage,
+		onCopyLink,
+		onLeave,
+		onDelete,
+	}
+}
diff --git a/src/teams/router.ts b/src/teams/router.ts
index fbdf99c95..3789376f0 100644
--- a/src/teams/router.ts
+++ b/src/teams/router.ts
@@ -8,7 +8,9 @@ import type { RouteRecordRaw } from 'vue-router'
 import { generateUrl } from '@nextcloud/router'
 import { createRouter, createWebHistory } from 'vue-router'
 import HomeView from './views/HomeView.vue'
+import TeamDashboardView from './views/TeamDashboardView.vue'
 import TeamPage from './views/TeamPage.vue'
+import TeamSettingsView from './views/TeamSettingsView.vue'
 
 const routes: RouteRecordRaw[] = [
 	{
@@ -17,10 +19,23 @@ const routes: RouteRecordRaw[] = [
 		component: HomeView,
 	},
 	{
-		name: 'team',
 		path: '/team/:teamId',
 		component: TeamPage,
 		props: true,
+		children: [
+			{
+				name: 'team',
+				path: '',
+				component: TeamDashboardView,
+				props: true,
+			},
+			{
+				name: 'team-settings',
+				path: 'settings',
+				component: TeamSettingsView,
+				props: true,
+			},
+		],
 	},
 ]
 
diff --git a/src/teams/store.ts b/src/teams/store.ts
index 8dc158fde..6524ee272 100644
--- a/src/teams/store.ts
+++ b/src/teams/store.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { Member, Team } from './types.ts'
+import type { Member, MemberCandidate, Team } from './types.ts'
 
 import { defineStore } from 'pinia'
 import { logger } from '../logger.ts'
@@ -16,8 +16,8 @@ interface TeamsState {
 	loading: boolean
 	/** Whether the last teams load failed. */
 	loadError: boolean
-	/** Whether the "create a new team" dialog is open (shared across the app). */
-	createDialogOpen: boolean
+	/** Whether the "create a new team" wizard is open (shared across the app). */
+	createWizardOpen: boolean
 }
 
 /**
@@ -30,7 +30,7 @@ export const useTeamsStore = defineStore('teams', {
 		teams: [],
 		loading: false,
 		loadError: false,
-		createDialogOpen: false,
+		createWizardOpen: false,
 	}),
 
 	getters: {
@@ -48,9 +48,9 @@ export const useTeamsStore = defineStore('teams', {
 	},
 
 	actions: {
-		/** Open the "create a new team" dialog. */
-		openCreateTeamDialog(): void {
-			this.createDialogOpen = true
+		/** Open the "create a new team" wizard. */
+		openCreateTeamWizard(): void {
+			this.createWizardOpen = true
 		},
 
 		/** Load (or reload) the list of teams from the backend. */
@@ -97,6 +97,27 @@ export const useTeamsStore = defineStore('teams', {
 			return this.getTeam(id)
 		},
 
+		/**
+		 * Search for potential new members while creating a team (users,
+		 * groups, emails, contacts, other teams…).
+		 *
+		 * @param term - The search query
+		 */
+		searchMemberCandidates(term: string): Promise<MemberCandidate[]> {
+			return api.searchMemberCandidates(term)
+		},
+
+		/**
+		 * Add initial members to a freshly created team.
+		 *
+		 * @param teamId - The team id
+		 * @param candidates - The candidates picked in the wizard's member step
+		 * @return The number of candidates that were actually added.
+		 */
+		addTeamMembers(teamId: string, candidates: MemberCandidate[]): Promise<number> {
+			return api.addTeamMembers(teamId, candidates)
+		},
+
 		/**
 		 * Leave a team and reload the list.
 		 *
diff --git a/src/teams/team-page/components/CircleDetails.vue b/src/teams/team-page/components/CircleDetails.vue
index ef5bda04c..147ea4edc 100644
--- a/src/teams/team-page/components/CircleDetails.vue
+++ b/src/teams/team-page/components/CircleDetails.vue
@@ -6,48 +6,27 @@
 <template>
 	<div class="circle-details-container">
 		<div class="circle-details-grid" :class="{ 'is-editing': isEditing }">
-			<div class="circle-details__header-wrapper">
-				<div class="circle-details-grid__avatar">
-					<NcLoadingIcon v-if="loadingAvatar" :size="75" />
-					<Avatar
-						v-else
-						:disable-tooltip="true"
-						:display-name="circle.displayName"
-						:is-no-user="true"
-						:url="displayAvatarUrl"
-						:size="75" />
+			<div class="circle-details__header">
+				<div v-if="isEditing" class="circle-name-wrapper">
+					<NcTextField
+						v-model="circle.displayName"
+						:placeholder="t('circles', 'Team name')"
+						:label="t('circles', 'Team name')" />
 				</div>
-				<div class="circle-details__header">
-					<div class="circle-name-wrapper">
-						<h2 v-if="!isEditing" class="circle-name">
-							<span :title="circle.displayName">{{ circle.displayName }}</span>
-							<NcLoadingIcon v-if="loadingName" :size="24" />
-						</h2>
-						<NcTextField
-							v-else
-							v-model="circle.displayName"
-							:placeholder="t('circles', 'Team name')"
-							label="Team name" />
-					</div>
-					<div v-if="!isEditing" class="subtitle">
-						<span>{{ t('circles', 'Team owner') }}</span> <UserBubble
-							:user="circle.owner.userId"
-							:display-name="circle.isOwner ? 'you' : circle.owner.displayName" />
-					</div>
-					<div v-if="showDescription" class="circle-description-wrapper">
-						<div v-if="!isEditing" class="circle-description">
-							{{ circle.description }}
-						</div>
-						<NcTextArea
-							v-else
-							v-model="circle.description"
-							:placeholder="descriptionPlaceholder"
-							label="Description"
-							:maxlength="1024" />
+				<div v-if="showDescription" class="circle-description-wrapper">
+					<div v-if="!isEditing" class="circle-description">
+						{{ circle.description }}
 					</div>
-					<div v-if="avatarSupported" class="circle-avatar-buttons-wrapper">
-						<NcButton
-							v-if="isEditing"
+					<NcTextArea
+						v-else
+						v-model="circle.description"
+						:placeholder="descriptionPlaceholder"
+						:label="t('circles', 'Description')"
+						:maxlength="1024" />
+				</div>
+				<div v-if="avatarSupported" class="circle-avatar-buttons-wrapper">
+					<NcButton
+						v-if="isEditing"
 							:disabled="loadingAvatar"
 							@click="openLocalFilePicker">
 							<template #icon>
@@ -174,6 +153,7 @@
 									:value="resourceInputs[resourceType.id] || ''"
 									:is-open="activePopover === resourceType.id"
 									:helper-text="resourceType.helperText"
+									:loading="resourceType.id === 'teamfolder' && creatingTeamFolder"
 									@update:value="updateResourceInput(resourceType.id, $event)"
 									@update:is-open="setActivePopover(resourceType.id, $event)"
 									@create="handleResourceCreation">
@@ -185,9 +165,8 @@
 						</div>
 					</div>
 				</div>
-			</div>
 
-			<!-- Main content now a direct child of the grid -->
+				<!-- Main content now a direct child of the grid -->
 			<div class="circle-details__main-content">
 				<!-- not a member -->
 				<template v-if="!circle.isMember">
@@ -285,7 +264,6 @@ import { FilePickerClosed, FilePickerType, getFilePickerBuilder, showError, show
 import { encodePath } from '@nextcloud/paths'
 import { generateOcsUrl, generateRemoteUrl, generateUrl } from '@nextcloud/router'
 import {
-	NcAvatar as Avatar,
 	NcListItem as ListItem,
 	NcActionButton,
 	NcActions,
@@ -296,7 +274,6 @@ import {
 	NcPopover,
 	NcTextArea,
 	NcTextField,
-	NcUserBubble as UserBubble,
 } from '@nextcloud/vue'
 import { useElementSize } from '@vueuse/core'
 import { reactive, ref } from 'vue'
@@ -311,6 +288,7 @@ import CopyIcon from 'vue-material-design-icons/ContentCopy.vue'
 import FileDocumentOutline from 'vue-material-design-icons/FileDocumentOutline.vue'
 import FolderIcon from 'vue-material-design-icons/Folder.vue'
 import FolderOutlineIcon from 'vue-material-design-icons/FolderOutline.vue'
+import FolderPlusOutlineIcon from 'vue-material-design-icons/FolderPlusOutline.vue'
 import LoginIcon from 'vue-material-design-icons/Login.vue'
 import LogoutIcon from 'vue-material-design-icons/Logout.vue'
 import MessageIcon from 'vue-material-design-icons/MessageOutline.vue'
@@ -324,6 +302,7 @@ import TeamResourceButton from './CircleDetails/TeamResourceButton.vue'
 import MemberList from './MemberList/MemberList.vue'
 import CircleActionsMixin from '../mixins/CircleActionsMixin.js'
 import { CircleEdit, editCircle } from '../services/circles.ts'
+import { getTeamFolder, upgradeTeamFolder } from '../../api.ts'
 
 import 'cropperjs/dist/cropper.css'
 
@@ -346,7 +325,6 @@ export default {
 
 	components: {
 		AccountPlusIcon,
-		Avatar,
 		NcButton,
 		NcDialog,
 		ContentHeading,
@@ -364,12 +342,12 @@ export default {
 		NcLoadingIcon,
 		NcPopover,
 		PencilIcon,
-		UserBubble,
 		NcTextField,
 		NcTextArea,
 		NcActions,
 		NcActionButton,
 		FolderOutlineIcon,
+		FolderPlusOutlineIcon,
 		MessageIcon,
 		CalendarIcon,
 		ViewDashboardIcon,
@@ -416,6 +394,11 @@ export default {
 			showCalendarSuccessNotification: false,
 			createdCalendarName: '',
 
+			// Team folder
+			teamFolder: null,
+			loadingTeamFolder: false,
+			creatingTeamFolder: false,
+
 			// Avatar
 			avatarUrl: undefined,
 			pendingAvatarBlob: null,
@@ -480,6 +463,10 @@ export default {
 			return (this.circle.isOwner || this.circle.isAdmin) && !this.circle.isPersonal
 		},
 
+		canCreateTeamFolder() {
+			return this.canManageTeam || Boolean(getCurrentUser()?.isAdmin)
+		},
+
 		teamHasCollective() {
 			return this.resourcesForProvider('collectives').length > 0
 		},
@@ -529,12 +516,23 @@ export default {
 			const enabledApps = window.OC?.appswebroots || {}
 
 			return [
+				{
+					id: 'teamfolder',
+					label: t('circles', 'Team space'),
+					inputLabel: null,
+					placeholder: null,
+					helperText: t('circles', 'Create a shared team space for this team.'),
+					icon: 'FolderPlusOutlineIcon',
+					apiPath: null,
+					enabled: this.canCreateTeamFolder && !this.teamFolder && !this.loadingTeamFolder,
+					noInput: true,
+				},
 				{
 					id: 'folder',
 					label: t('circles', 'Folder'),
 					inputLabel: t('circles', 'New folder'),
 					placeholder: t('circles', 'Folder name'),
-					helperText: t('circles', 'This will create a regular folder shared with the team. To create a Team Folder, please contact your {productName} administrator', { productName: OC.theme.name }),
+					helperText: t('circles', 'This will create a regular folder shared with the team.'),
 					icon: 'FolderOutlineIcon',
 					apiPath: 'files',
 					enabled: enabledApps.files !== undefined,
@@ -576,6 +574,7 @@ export default {
 			handler() {
 				this.isEditing = false
 				this.fetchTeamResources()
+				this.loadTeamFolder()
 				if (this.avatarSupported) {
 					this.cancelSetAvatar()
 					this.clearPendingAvatar()
@@ -609,11 +608,52 @@ export default {
 			this.resourceInputs[resourceId] = value
 		},
 
+		async loadTeamFolder() {
+			this.loadingTeamFolder = true
+			this.teamFolder = null
+			try {
+				this.teamFolder = await getTeamFolder(this.circle.id)
+			} catch (error) {
+				// A 404 means the team has no linked folder yet, which is the
+				// expected state for teams created before auto-creation.
+				if (error?.response?.status === 404) {
+					this.teamFolder = null
+					return
+				}
+				console.error('Could not load team folder', { error, circleId: this.circle.id })
+				showError(t('circles', 'Could not load team space'))
+				this.teamFolder = null
+			} finally {
+				this.loadingTeamFolder = false
+			}
+		},
+
+		async createTeamFolder() {
+			this.creatingTeamFolder = true
+			try {
+				this.teamFolder = await upgradeTeamFolder(this.circle.id)
+				this.$router.push({
+					name: 'team',
+					params: { teamId: this.circle.id },
+				})
+			} catch (error) {
+				console.error('Could not create team folder', { error, circleId: this.circle.id })
+				showError(t('circles', 'Could not create the team space'))
+			} finally {
+				this.creatingTeamFolder = false
+			}
+		},
+
 		async handleResourceCreation({ resourceType, name }) {
 			try {
 				let resourceId
 
 				switch (resourceType.id) {
+					case 'teamfolder': {
+						await this.createTeamFolder()
+						return
+					}
+
 					case 'folder': {
 						const folderPath = `/remote.php/dav/files/${getCurrentUser().uid}/${name}`
 						await axios.request({
@@ -1049,19 +1089,8 @@ export default {
 			}
 		}
 
-		.circle-details__header-wrapper {
-			display: grid;
-			grid-template-columns: auto 1fr;
-			align-items: center;
-			gap: 24px;
-		}
-
 		.circle-details__main-content {
-			margin-inline-start: 99px;
-
-			@media (max-width: 768px) {
-				margin-inline-start: 0;
-			}
+			margin-inline-start: 0;
 		}
 	}
 
@@ -1078,17 +1107,6 @@ export default {
 			margin-bottom: 4px;
 		}
 
-		.circle-name {
-			font-size: 1.5rem;
-			font-weight: bold;
-			margin: 0;
-			margin-bottom: 2px;
-		}
-
-		.subtitle {
-			color: var(--color-text-maxcontrast);
-		}
-
 		.actions {
 			display: flex;
 			gap: 8px;
diff --git a/src/teams/team-page/components/CircleDetails/TeamResourceButton.vue b/src/teams/team-page/components/CircleDetails/TeamResourceButton.vue
index 1871e8fea..23cf5ad8f 100644
--- a/src/teams/team-page/components/CircleDetails/TeamResourceButton.vue
+++ b/src/teams/team-page/components/CircleDetails/TeamResourceButton.vue
@@ -11,10 +11,12 @@
 		<template #trigger>
 			<NcButton
 				variant="secondary"
+				:disabled="loading"
 				:aria-describedby="`tooltip-${resourceType.id}`"
 				@click="openPopover">
 				<template #icon>
-					<slot name="icon" />
+					<NcLoadingIcon v-if="loading" :size="20" />
+					<slot v-else name="icon" />
 				</template>
 				{{ resourceType.label }}
 			</NcButton>
@@ -58,7 +60,7 @@
 
 <script>
 // @ts-nocheck
-import { NcButton, NcNoteCard, NcPopover, NcTextField } from '@nextcloud/vue'
+import { NcButton, NcLoadingIcon, NcNoteCard, NcPopover, NcTextField } from '@nextcloud/vue'
 import CheckOutlineIcon from 'vue-material-design-icons/Check.vue'
 import CloseOutlineIcon from 'vue-material-design-icons/Close.vue'
 
@@ -67,6 +69,7 @@ export default {
 
 	components: {
 		NcButton,
+		NcLoadingIcon,
 		NcNoteCard,
 		NcPopover,
 		NcTextField,
@@ -89,6 +92,11 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+
+		loading: {
+			type: Boolean,
+			default: false,
+		},
 	},
 
 	emits: ['update:value', 'update:isOpen', 'create'],
diff --git a/src/teams/team-page/models/constants.ts b/src/teams/team-page/models/constants.ts
index 0d386b8a5..23058a4f0 100644
--- a/src/teams/team-page/models/constants.ts
+++ b/src/teams/team-page/models/constants.ts
@@ -20,7 +20,7 @@ export const LIST_SIZE = 60
 // Dynamic default groups
 export const GROUP_ALL_CONTACTS: DefaultGroup = t('circles', 'All contacts')
 export const GROUP_NO_GROUP_CONTACTS: DefaultGroup = t('circles', 'Not grouped')
-export const GROUP_RECENTLY_CONTACTED: DefaultGroup = 'Recently contacted'
+export const GROUP_RECENTLY_CONTACTED: DefaultGroup = t('circles', 'Recently contacted')
 
 // Organization default chart for all contacts
 export const CHART_ALL_CONTACTS: DefaultChart = t('circles', 'Organization chart')
diff --git a/src/teams/types.ts b/src/teams/types.ts
index 229b123d2..e51a512c5 100644
--- a/src/teams/types.ts
+++ b/src/teams/types.ts
@@ -46,3 +46,20 @@ export interface Team {
 	members: Member[]
 	resources: Resource[]
 }
+
+/**
+ * A candidate member surfaced by the sharee autocompletion search (users,
+ * groups, emails, contacts, other teams…), before they have been added to a
+ * team. Used by the team creation wizard's member selection step.
+ */
+export interface MemberCandidate {
+	/** Unique key across all suggestion types, safe to use as a list `:key`. */
+	key: string
+	/** The raw id expected by the "add members" endpoint. */
+	shareWith: string
+	/** The sharee share type, see `@nextcloud/sharing`'s `ShareType`. */
+	shareType: number
+	displayName: string
+	/** Whether this candidate is a real Nextcloud user (controls avatar rendering). */
+	isUser: boolean
+}
diff --git a/src/teams/views/HomeView.vue b/src/teams/views/HomeView.vue
index 41163148c..c90244ce7 100644
--- a/src/teams/views/HomeView.vue
+++ b/src/teams/views/HomeView.vue
@@ -16,7 +16,7 @@ import { useTeamsStore } from '../store.ts'
 
 const store = useTeamsStore()
 const { teams, loading, loadError } = storeToRefs(store)
-const { loadTeams, openCreateTeamDialog } = store
+const { loadTeams, openCreateTeamWizard } = store
 </script>
 
 <template>
@@ -56,7 +56,7 @@ const { loadTeams, openCreateTeamDialog } = store
 				<NcIconSvgWrapper :path="mdiAccountGroupOutline" />
 			</template>
 			<template #action>
-				<NcButton variant="primary" @click="openCreateTeamDialog()">
+				<NcButton variant="primary" @click="openCreateTeamWizard()">
 					{{ t('circles', 'Create your first team') }}
 				</NcButton>
 			</template>
diff --git a/src/teams/views/TeamDashboardView.vue b/src/teams/views/TeamDashboardView.vue
new file mode 100644
index 000000000..17ac29518
--- /dev/null
+++ b/src/teams/views/TeamDashboardView.vue
@@ -0,0 +1,93 @@
+<!--
+  - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<script setup lang="ts">
+import { showError } from '@nextcloud/dialogs'
+import { t } from '@nextcloud/l10n'
+import { ref, watch } from 'vue'
+import { useRoute } from 'vue-router'
+import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
+import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
+import TeamFolderWidget from '../components/TeamFolderWidget.vue'
+import { logger } from '../../logger.ts'
+import { getTeamFolder } from '../api.ts'
+import { router } from '../router.ts'
+
+const props = defineProps<{
+	teamId: string
+}>()
+
+const route = useRoute()
+
+const loading = ref(true)
+const folderId = ref<number | null>(null)
+const mountPoint = ref<string | null>(null)
+const loadError = ref(false)
+
+/**
+ * Load the team folder and redirect to settings when none exists.
+ */
+async function loadTeamFolder(): Promise<void> {
+	loading.value = true
+	loadError.value = false
+	folderId.value = null
+	mountPoint.value = null
+
+	try {
+		const folder = await getTeamFolder(props.teamId)
+		if (folder !== null) {
+			folderId.value = folder.id
+			mountPoint.value = folder.mountPoint
+		} else {
+			await router.replace({
+				name: 'team-settings',
+				params: { teamId: props.teamId },
+				query: route.query,
+			})
+		}
+	} catch (error) {
+		logger.error('Could not load team folder', { error, teamId: props.teamId })
+		showError(t('circles', 'Could not load team space'))
+		loadError.value = true
+	} finally {
+		loading.value = false
+	}
+}
+
+watch(() => props.teamId, loadTeamFolder, { immediate: true })
+</script>
+
+<template>
+	<div class="team-dashboard">
+		<div v-if="loading" class="team-dashboard__loading">
+			<NcLoadingIcon :size="44" />
+		</div>
+
+		<NcEmptyContent
+			v-else-if="loadError"
+			:name="t('circles', 'Team space unavailable')"
+			:description="t('circles', 'Could not load the team space. Please try again later.')" />
+
+		<TeamFolderWidget
+			v-else-if="mountPoint && folderId"
+			:mountPoint="mountPoint"
+			:rootFolderId="folderId" />
+	</div>
+</template>
+
+<style lang="scss" scoped>
+.team-dashboard {
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+
+	&__loading {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+}
+</style>
diff --git a/src/teams/views/TeamPage.vue b/src/teams/views/TeamPage.vue
index 8386951b4..969d6f201 100644
--- a/src/teams/views/TeamPage.vue
+++ b/src/teams/views/TeamPage.vue
@@ -12,7 +12,7 @@ import { useStore } from 'vuex'
 import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
 import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
 import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
-import CircleDetails from '../team-page/components/CircleDetails.vue'
+import TeamHeader from '../components/TeamHeader.vue'
 import { logger } from '../../logger.ts'
 
 const props = defineProps<{
@@ -57,6 +57,33 @@ watch(() => props.teamId, loadCircle, { immediate: true })
 			</template>
 		</NcEmptyContent>
 
-		<CircleDetails v-else :circle="circle" />
+		<template v-else>
+			<TeamHeader :circle="circle" />
+			<div class="team-page__content">
+				<router-view />
+			</div>
+		</template>
 	</div>
 </template>
+
+<style lang="scss" scoped>
+.team-page {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+
+	&__loading,
+	&__missing {
+		flex: 1 1 auto;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	&__content {
+		flex: 1 1 auto;
+		min-height: 0;
+		overflow: hidden;
+	}
+}
+</style>
diff --git a/src/teams/views/TeamSettingsView.vue b/src/teams/views/TeamSettingsView.vue
new file mode 100644
index 000000000..df803f402
--- /dev/null
+++ b/src/teams/views/TeamSettingsView.vue
@@ -0,0 +1,21 @@
+<!--
+  - SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useStore } from 'vuex'
+import CircleDetails from '../team-page/components/CircleDetails.vue'
+
+const props = defineProps<{
+	teamId: string
+}>()
+
+const store = useStore()
+const circle = computed(() => store.getters.getCircle(props.teamId))
+</script>
+
+<template>
+	<CircleDetails v-if="circle" :circle="circle" />
+</template>
diff --git a/templates/settings-team-folders.php b/templates/settings-team-folders.php
new file mode 100644
index 000000000..535b5e19f
--- /dev/null
+++ b/templates/settings-team-folders.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+?>
+
+<div id="vue-admin-team-folders"></div>
diff --git a/tests/unit/CirclesManagerTest.php b/tests/unit/CirclesManagerTest.php
index d6085f50f..c1216c096 100644
--- a/tests/unit/CirclesManagerTest.php
+++ b/tests/unit/CirclesManagerTest.php
@@ -73,11 +73,14 @@ public function testCreateCircle(): void {
 		$this->assertEquals($federatedUser->getSingleId(), $circle->getInitiator()->getSingleId());
 
 		// Created circle returned by probeCircle()
+		$this->startSession();
 		$circles = $this->circlesManager->probeCircles();
 		$this->assertCount(1, array_filter($circles, fn (Circle $c) => $c->getName() === $this->circleName));
 
 		// Destroyed circle not returned by probeCircle()
+		$this->startSession();
 		$this->circlesManager->destroyCircle($circle->getSingleId());
+		$this->startSession();
 		$circles = $this->circlesManager->probeCircles();
 		$this->assertCount(0, array_filter($circles, fn (Circle $c) => $c->getName() === $this->circleName));
 	}
@@ -86,6 +89,7 @@ public function testGetCirclesWithInitiator(): void {
 		// Create circle as user 'admin' and add test user as member
 		$this->startSession('admin');
 		$adminCircle = $this->circlesManager->createCircle($this->circleName);
+		$this->startSession('admin');
 		$this->circlesManager->addMember($adminCircle->getSingleId(), $this->circlesManager->getLocalFederatedUser($this->userId));
 
 		// Get circles as test user
@@ -111,6 +115,7 @@ public function testProbeCirclesWithInitiator(): void {
 		// Create circle as user 'admin' and add test user as member
 		$this->startSession('admin');
 		$adminCircle = $this->circlesManager->createCircle($this->circleName);
+		$this->startSession('admin');
 		$this->circlesManager->addMember($adminCircle->getSingleId(), $this->circlesManager->getLocalFederatedUser($this->userId));
 
 		// Probe circles as test user
@@ -138,6 +143,7 @@ public function testProbeCirclesWithInitiatorAsGroupMember(): void {
 		// Create circle as user 'admin' and add test group as member
 		$this->startSession('admin');
 		$adminCircle = $this->circlesManager->createCircle($this->circleName);
+		$this->startSession('admin');
 		$federatedGroup = $this->circlesManager->getFederatedUser($this->groupId, Member::TYPE_GROUP);
 		$this->circlesManager->addMember($adminCircle->getSingleId(), $federatedGroup);
 
diff --git a/tests/unit/lib/Controller/AdminControllerTest.php b/tests/unit/lib/Controller/AdminControllerTest.php
index b50610014..435ef68e1 100644
--- a/tests/unit/lib/Controller/AdminControllerTest.php
+++ b/tests/unit/lib/Controller/AdminControllerTest.php
@@ -39,6 +39,20 @@ class AdminControllerTest extends TestCase {
 	private array $circlesToCleanup = [];
 	private static array $usersToCleanup = [];
 
+	private function setCurrentUser(string $userId): void {
+		$user = $this->userManager->get($userId);
+		$this->container->get(IUserSession::class)->setUser($user);
+		$this->container->get(FederatedUserService::class)->setLocalCurrentUser($user);
+	}
+
+	private function createCircle(string $name, bool $personal = false): array {
+		$this->setCurrentUser(self::TEST_USER_1);
+		$circle = $this->container->get(CircleService::class)->create($name, personal: $personal);
+		$this->setCurrentUser(self::TEST_USER_1);
+
+		return $circle;
+	}
+
 	public static function setUpBeforeClass(): void {
 		parent::setUpBeforeClass();
 
@@ -64,9 +78,7 @@ public function setUp(): void {
 		$userSession = $this->container->get(IUserSession::class);
 		$federatedUserService = $this->container->get(FederatedUserService::class);
 
-		$user1 = $this->userManager->get(self::TEST_USER_1);
-		$userSession->setUser($user1);
-		$federatedUserService->setLocalCurrentUser($user1);
+		$this->setCurrentUser(self::TEST_USER_1);
 
 		$this->adminController = new AdminController(
 			Application::APP_ID,
@@ -99,6 +111,7 @@ protected function tearDown(): void {
 
 		foreach ($this->circlesToCleanup as $circleId) {
 			try {
+				$this->setCurrentUser(self::TEST_USER_1);
 				$circleService->destroy($circleId);
 			} catch (\Throwable) {
 				// continue cleanup
@@ -121,9 +134,10 @@ public function testCreate(): void {
 	public function testDestroy(): void {
 		$circleService = $this->container->get(CircleService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 
 		$this->adminController->destroy(self::TEST_USER_1, $circleData['id']);
+		$this->setCurrentUser(self::TEST_USER_1);
 
 		$this->expectException(CircleNotFoundException::class);
 
@@ -133,7 +147,7 @@ public function testDestroy(): void {
 	public function testMemberAdd(): void {
 		$circleService = $this->container->get(CircleService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		$result = $this->adminController->memberAdd(self::TEST_USER_1, $circleData['id'], self::TEST_USER_2, Member::TYPE_USER)->getData();
@@ -148,7 +162,7 @@ public function testMemberLevel(): void {
 		$federatedUserService = $this->container->get(FederatedUserService::class);
 		$memberService = $this->container->get(MemberService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		$user2 = $federatedUserService->generateFederatedUser(self::TEST_USER_2, Member::TYPE_USER);
@@ -170,9 +184,9 @@ public function testCircles(): void {
 		 */
 		$countBefore = count($this->adminController->circles(self::TEST_USER_1)->getData());
 
-		$circleData = $circleService->create('test-circle');
-		$circleData2 = $circleService->create('test-circle-2');
-		$circleData3 = $circleService->create('test-circle-3');
+		$circleData = $this->createCircle('test-circle');
+		$circleData2 = $this->createCircle('test-circle-2');
+		$circleData3 = $this->createCircle('test-circle-3');
 		$this->circlesToCleanup[] = $circleData['id'];
 		$this->circlesToCleanup[] = $circleData2['id'];
 		$this->circlesToCleanup[] = $circleData3['id'];
@@ -207,8 +221,8 @@ public function testCirclesAll(): void {
 		$countBeforeWithPersonal = count($this->adminController->circlesAll(filterPersonal: false)->getData());
 		$countBeforeWithoutPersonal = count($this->adminController->circlesAll(filterPersonal: true)->getData());
 
-		$circleData = $circleService->create('test-circle');
-		$circleDataPersonal = $circleService->create('test-circle-personal', personal: true);
+		$circleData = $this->createCircle('test-circle');
+		$circleDataPersonal = $this->createCircle('test-circle-personal', personal: true);
 		$this->circlesToCleanup[] = $circleData['id'];
 		$this->circlesToCleanup[] = $circleDataPersonal['id'];
 
@@ -230,7 +244,7 @@ public function testCirclesAll(): void {
 	public function testCircleDetails(): void {
 		$circleService = $this->container->get(CircleService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		$result = $this->adminController->circleDetails(self::TEST_USER_1, $circleData['id'])->getData();
@@ -247,7 +261,7 @@ public function testCircleJoin(): void {
 		$circleService = $this->container->get(CircleService::class);
 		$memberService = $this->container->get(MemberService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		// circle is visible to everyone and anyone can join
@@ -271,16 +285,14 @@ public function testCircleLeave(): void {
 		$federatedUserService = $this->container->get(FederatedUserService::class);
 		$memberService = $this->container->get(MemberService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		// circle is visible to everyone and anyone can join
 		$circleConfig = Circle::CFG_VISIBLE + Circle::CFG_OPEN;
 		$circleService->updateConfig($circleData['id'], $circleConfig);
 
-		$user2 = $this->userManager->get(self::TEST_USER_2);
-
-		$federatedUserService->setLocalCurrentUser($user2);
+		$this->setCurrentUser(self::TEST_USER_2);
 		$memberData = $circleService->circleJoin($circleData['id']);
 
 		$this->adminController->circleLeave(self::TEST_USER_2, $circleData['id'])->getData();
@@ -294,20 +306,17 @@ public function testMemberConfirm(): void {
 		$circleService = $this->container->get(CircleService::class);
 		$federatedUserService = $this->container->get(FederatedUserService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		// circle is visible to everyone but requires approval to join
 		$circleConfig = Circle::CFG_VISIBLE + Circle::CFG_OPEN + Circle::CFG_REQUEST;
 		$circleService->updateConfig($circleData['id'], $circleConfig);
 
-		$user1 = $this->userManager->get(self::TEST_USER_1);
-		$user2 = $this->userManager->get(self::TEST_USER_2);
-
-		$federatedUserService->setLocalCurrentUser($user2);
+		$this->setCurrentUser(self::TEST_USER_2);
 		$memberData = $circleService->circleJoin($circleData['id']);
 
-		$federatedUserService->setLocalCurrentUser($user1);
+		$this->setCurrentUser(self::TEST_USER_1);
 
 		// as TEST_USER_1, allow TEST_USER_2 to be a member of the team
 		$result = $this->adminController->memberConfirm(self::TEST_USER_1, $circleData['id'], $memberData['id'])->getData();
@@ -324,7 +333,7 @@ public function testMemberRemove(): void {
 		$federatedUserService = $this->container->get(FederatedUserService::class);
 		$memberService = $this->container->get(MemberService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		$user2 = $federatedUserService->generateFederatedUser(self::TEST_USER_2, Member::TYPE_USER);
@@ -342,7 +351,7 @@ public function testMembers(): void {
 		$federatedUserService = $this->container->get(FederatedUserService::class);
 		$memberService = $this->container->get(MemberService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		$user2 = $federatedUserService->generateFederatedUser(self::TEST_USER_2, Member::TYPE_USER);
@@ -365,7 +374,7 @@ public function testMembers(): void {
 	public function testEditName(): void {
 		$circleService = $this->container->get(CircleService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		$result = $this->adminController->editName(self::TEST_USER_1, $circleData['id'], 'test-cricle-new-name')->getData();
@@ -377,7 +386,7 @@ public function testEditName(): void {
 	public function testEditDescription(): void {
 		$circleService = $this->container->get(CircleService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		$result = $this->adminController->editDescription(self::TEST_USER_1, $circleData['id'], 'test-cricle-new-description')->getData();
@@ -389,7 +398,7 @@ public function testEditDescription(): void {
 	public function testEditSetting(): void {
 		$circleService = $this->container->get(CircleService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		$result = $this->adminController->editSetting(self::TEST_USER_1, $circleData['id'], ConfigService::MEMBERS_LIMIT, '25')->getData();
@@ -401,7 +410,7 @@ public function testEditSetting(): void {
 	public function testEditConfig(): void {
 		$circleService = $this->container->get(CircleService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		$result = $this->adminController->editConfig(self::TEST_USER_1, $circleData['id'], 128)->getData();
@@ -415,7 +424,7 @@ public function testLink(): void {
 		$federatedUserService = $this->container->get(FederatedUserService::class);
 		$memberService = $this->container->get(MemberService::class);
 
-		$circleData = $circleService->create('test-circle');
+		$circleData = $this->createCircle('test-circle');
 		$this->circlesToCleanup[] = $circleData['id'];
 
 		$user2 = $federatedUserService->generateFederatedUser(self::TEST_USER_2, Member::TYPE_USER);
diff --git a/tests/unit/lib/Service/TeamFolderServiceTest.php b/tests/unit/lib/Service/TeamFolderServiceTest.php
new file mode 100644
index 000000000..8d9fc501e
--- /dev/null
+++ b/tests/unit/lib/Service/TeamFolderServiceTest.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Circles\Tests\Unit\Service;
+
+use OCA\Circles\ConfigLexicon;
+use OCA\Circles\Model\Circle;
+use OCA\Circles\Service\TeamFolderService;
+use OCP\AppFramework\Services\IAppConfig;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class TeamFolderServiceTest extends TestCase {
+	private TeamFolderService $service;
+	private IAppConfig&MockObject $appConfig;
+
+	protected function setUp(): void {
+		parent::setUp();
+
+		$this->appConfig = $this->createMock(IAppConfig::class);
+
+		$this->service = new TeamFolderService(
+			$this->appConfig,
+		);
+	}
+
+	public function testShouldCreateTeamFolderSkipsForPersonalCircle(): void {
+		$circle = $this->createCircle(Circle::CFG_PERSONAL);
+		$this->appConfig->method('getAppValueBool')
+			->with(ConfigLexicon::TEAM_FOLDER_AUTO_CREATE, true)
+			->willReturn(true);
+
+		$this->assertFalse($this->service->shouldCreateTeamFolder($circle));
+	}
+
+	public function testShouldCreateTeamFolderSkipsForHiddenCircle(): void {
+		$circle = $this->createCircle(Circle::CFG_HIDDEN);
+		$this->appConfig->method('getAppValueBool')
+			->with(ConfigLexicon::TEAM_FOLDER_AUTO_CREATE, true)
+			->willReturn(true);
+
+		$this->assertFalse($this->service->shouldCreateTeamFolder($circle));
+	}
+
+	public function testShouldCreateTeamFolderSkipsForSystemCircle(): void {
+		$circle = $this->createCircle(Circle::CFG_SYSTEM);
+		$this->appConfig->method('getAppValueBool')
+			->with(ConfigLexicon::TEAM_FOLDER_AUTO_CREATE, true)
+			->willReturn(true);
+
+		$this->assertFalse($this->service->shouldCreateTeamFolder($circle));
+	}
+
+	public function testShouldCreateTeamFolderSkipsForBackendCircle(): void {
+		$circle = $this->createCircle(Circle::CFG_BACKEND);
+		$this->appConfig->method('getAppValueBool')
+			->with(ConfigLexicon::TEAM_FOLDER_AUTO_CREATE, true)
+			->willReturn(true);
+
+		$this->assertFalse($this->service->shouldCreateTeamFolder($circle));
+	}
+
+	public function testShouldCreateTeamFolderSkipsWhenAutoCreateDisabled(): void {
+		$circle = $this->createCircle();
+		$this->appConfig->method('getAppValueBool')
+			->with(ConfigLexicon::TEAM_FOLDER_AUTO_CREATE, true)
+			->willReturn(false);
+
+		$this->assertFalse($this->service->shouldCreateTeamFolder($circle));
+	}
+
+	public function testShouldCreateTeamFolderReturnsTrueForEligibleCircle(): void {
+		$circle = $this->createCircle();
+		$this->appConfig->method('getAppValueBool')
+			->with(ConfigLexicon::TEAM_FOLDER_AUTO_CREATE, true)
+			->willReturn(true);
+
+		$this->assertTrue($this->service->shouldCreateTeamFolder($circle));
+	}
+
+	public function testGetDefaultQuota(): void {
+		$this->appConfig->method('getAppValueInt')
+			->with(ConfigLexicon::TEAM_FOLDER_DEFAULT_QUOTA, 0)
+			->willReturn(1073741824);
+
+		$this->assertSame(1073741824, $this->service->getDefaultQuota());
+	}
+
+	/**
+	 * @param int $config bitwise circle config flags
+	 */
+	private function createCircle(int $config = Circle::CFG_CIRCLE): Circle&MockObject {
+		$circle = $this->createMock(Circle::class);
+		$circle->method('isConfig')
+			->willReturnCallback(function (int $flag) use ($config): bool {
+				return ($config & $flag) === $flag;
+			});
+
+		return $circle;
+	}
+}
diff --git a/vite.config.ts b/vite.config.ts
index e35c0252b..e1f62a13d 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -10,6 +10,7 @@ export default (env) => createAppConfig({
 	main: join(import.meta.dirname, 'src/main.ts'),
 	dashboard: join(import.meta.dirname, 'src/dashboard.ts'),
 	'settings-admin': join(import.meta.dirname, 'src/settings-admin.ts'),
+	'settings-team-folders': join(import.meta.dirname, 'src/settings-team-folders.ts'),
 }, {
 	appName: 'teams',
 	emptyOutputDirectory: { additionalDirectories: ['css'] },