diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 999350458..22c793110 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ jobs:
         strategy:
             matrix:
                 php-versions: [8.2, 8.3, 8.4]
-                nextcloud-versions: ['stable31']
+                nextcloud-versions: ['stable31', 'stable32']
         name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests
         steps:
             - name: Set up php${{ matrix.php-versions }}
@@ -41,6 +41,9 @@ jobs:
             - name: Enable maps app
               working-directory: nextcloud
               run: php -f occ app:enable maps
+            - name: Enable files_external app
+              working-directory: nextcloud
+              run: php -f occ app:enable files_external
             - name: Run tests
               if: ${{ always() && matrix.php-versions != 8.1 }}
               working-directory: nextcloud/apps/maps
diff --git a/appinfo/info.xml b/appinfo/info.xml
index aea92be0a..b36d7cce7 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -37,7 +37,7 @@
     <dependencies>
         <php min-version="8.1" max-version="8.4"/>
         <lib>exif</lib>
-        <nextcloud min-version="30" max-version="31"/>
+        <nextcloud min-version="30" max-version="32"/>
     </dependencies>
     <repair-steps>
 		<post-migration>
diff --git a/tests/Unit/Controller/ContactsControllerTest.php b/tests/Unit/Controller/ContactsControllerTest.php
index bcb8ee09f..cd8e6f289 100644
--- a/tests/Unit/Controller/ContactsControllerTest.php
+++ b/tests/Unit/Controller/ContactsControllerTest.php
@@ -108,7 +108,7 @@ protected function setUp(): void {
 		//$this->userPrincipalBackend = new Principal(
 		//    $c->getServer()->getUserManager(),
 		//    $c->getServer()->getGroupManager(),
-		//    $c->getServer()->getShareManager(),
+		//    $c->getServer()->get(\OCP\Share\IManager::class),
 		//    \OC::$server->getUserSession(),
 		//    $c->query(IServerContainer::class)->getConfig(),
 		//    \OC::$server->getAppManager()
@@ -130,7 +130,7 @@ protected function setUp(): void {
 			$this->addressService,
 			'test',
 			$this->cdBackend,
-			$c->query(IServerContainer::class)->getAvatarManager(),
+			$c->query(IServerContainer::class)->get(\OCP\IAvatarManager::class),
 			$this->root,
 			$urlGenerator);
 		//$this->contactsController = $this->getMockBuilder('OCA\Maps\Controller\ContactsController')
@@ -145,7 +145,7 @@ protected function setUp(): void {
 			$this->addressService,
 			'test2',
 			$this->cdBackend,
-			$c->query(IServerContainer::class)->getAvatarManager(),
+			$c->query(IServerContainer::class)->get(\OCP\IAvatarManager::class),
 			$this->root,
 			$urlGenerator
 		);
diff --git a/tests/Unit/Controller/DevicesApiControllerTest.php b/tests/Unit/Controller/DevicesApiControllerTest.php
index 1b11205d3..bac12b4f3 100644
--- a/tests/Unit/Controller/DevicesApiControllerTest.php
+++ b/tests/Unit/Controller/DevicesApiControllerTest.php
@@ -83,7 +83,7 @@ protected function setUp(): void {
 			$this->request,
 			$c->query(IServerContainer::class),
 			$c->query(IServerContainer::class)->getConfig(),
-			$c->getServer()->getShareManager(),
+			$c->getServer()->get(\OCP\Share\IManager::class),
 			$c->getServer()->getAppManager(),
 			$c->getServer()->getUserManager(),
 			$c->getServer()->getGroupManager(),
@@ -97,7 +97,7 @@ protected function setUp(): void {
 			$this->request,
 			$c->query(IServerContainer::class),
 			$c->query(IServerContainer::class)->getConfig(),
-			$c->getServer()->getShareManager(),
+			$c->getServer()->get(\OCP\Share\IManager::class),
 			$c->getServer()->getAppManager(),
 			$c->getServer()->getUserManager(),
 			$c->getServer()->getGroupManager(),
diff --git a/tests/Unit/Controller/DevicesControllerTest.php b/tests/Unit/Controller/DevicesControllerTest.php
index a0962b184..d61a7b3a8 100644
--- a/tests/Unit/Controller/DevicesControllerTest.php
+++ b/tests/Unit/Controller/DevicesControllerTest.php
@@ -85,14 +85,14 @@ protected function setUp(): void {
 			$this->request,
 			$c->query(IServerContainer::class),
 			$c->query(IServerContainer::class)->getConfig(),
-			$c->getServer()->getShareManager(),
+			$c->getServer()->get(\OCP\Share\IManager::class),
 			$c->getServer()->getAppManager(),
 			$c->getServer()->getUserManager(),
 			$c->getServer()->getGroupManager(),
 			$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
 			$c->query(DevicesService::class),
 			$c->query(DeviceShareMapper::class),
-			$c->query(IServerContainer::class)->getDateTimeZone(),
+			$c->query(IServerContainer::class)->get(\OCP\IDateTimeZone::class),
 			$c->query(IRootFolder::class),
 			'test'
 		);
@@ -102,14 +102,14 @@ protected function setUp(): void {
 			$this->request,
 			$c->query(IServerContainer::class),
 			$c->query(IServerContainer::class)->getConfig(),
-			$c->getServer()->getShareManager(),
+			$c->getServer()->get(\OCP\Share\IManager::class),
 			$c->getServer()->getAppManager(),
 			$c->getServer()->getUserManager(),
 			$c->getServer()->getGroupManager(),
 			$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
 			$c->query(DevicesService::class),
 			$c->query(DeviceShareMapper::class),
-			$c->query(IServerContainer::class)->getDateTimeZone(),
+			$c->query(IServerContainer::class)->get(\OCP\IDateTimeZone::class),
 			$c->query(IRootFolder::class),
 			'test2'
 		);
diff --git a/tests/Unit/Controller/FavoritesApiControllerTest.php b/tests/Unit/Controller/FavoritesApiControllerTest.php
index 48a94040d..939563bc8 100644
--- a/tests/Unit/Controller/FavoritesApiControllerTest.php
+++ b/tests/Unit/Controller/FavoritesApiControllerTest.php
@@ -83,7 +83,7 @@ protected function setUp(): void {
 			$this->request,
 			$c->query(IServerContainer::class),
 			$c->query(IServerContainer::class)->getConfig(),
-			$c->getServer()->getShareManager(),
+			$c->getServer()->get(\OCP\Share\IManager::class),
 			$c->getServer()->getAppManager(),
 			$c->getServer()->getUserManager(),
 			$c->getServer()->getGroupManager(),
@@ -97,7 +97,7 @@ protected function setUp(): void {
 			$this->request,
 			$c->query(IServerContainer::class),
 			$c->query(IServerContainer::class)->getConfig(),
-			$c->getServer()->getShareManager(),
+			$c->getServer()->get(\OCP\Share\IManager::class),
 			$c->getServer()->getAppManager(),
 			$c->getServer()->getUserManager(),
 			$c->getServer()->getGroupManager(),
diff --git a/tests/Unit/Controller/FavoritesControllerTest.php b/tests/Unit/Controller/FavoritesControllerTest.php
index 26daca5af..7194ac275 100644
--- a/tests/Unit/Controller/FavoritesControllerTest.php
+++ b/tests/Unit/Controller/FavoritesControllerTest.php
@@ -93,13 +93,13 @@ protected function setUp(): void {
 			$this->request,
 			$c->query(IServerContainer::class),
 			$c->query(IServerContainer::class)->getConfig(),
-			$c->getServer()->getShareManager(),
+			$c->getServer()->get(\OCP\Share\IManager::class),
 			$c->getServer()->getAppManager(),
 			$c->getServer()->getUserManager(),
 			$c->getServer()->getGroupManager(),
 			$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
 			$c->query(FavoritesService::class),
-			$c->query(IServerContainer::class)->getDateTimeZone(),
+			$c->query(IServerContainer::class)->get(\OCP\IDateTimeZone::class),
 			$c->query(FavoriteShareMapper::class),
 			'test'
 		);
@@ -109,13 +109,13 @@ protected function setUp(): void {
 			$this->request,
 			$c->query(IServerContainer::class),
 			$c->query(IServerContainer::class)->getConfig(),
-			$c->getServer()->getShareManager(),
+			$c->getServer()->get(\OCP\Share\IManager::class),
 			$c->getServer()->getAppManager(),
 			$c->getServer()->getUserManager(),
 			$c->getServer()->getGroupManager(),
 			$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
 			$c->query(FavoritesService::class),
-			$c->query(IServerContainer::class)->getDateTimeZone(),
+			$c->query(IServerContainer::class)->get(\OCP\IDateTimeZone::class),
 			$c->query(FavoriteShareMapper::class),
 			'test2'
 		);
diff --git a/tests/Unit/Controller/PhotosControllerTest.php b/tests/Unit/Controller/PhotosControllerTest.php
index e4e895e84..b6ab6e56a 100644
--- a/tests/Unit/Controller/PhotosControllerTest.php
+++ b/tests/Unit/Controller/PhotosControllerTest.php
@@ -92,7 +92,7 @@ protected function setUp(): void {
 			$this->rootFolder,
 			$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
 			$c->query(GeophotoMapper::class),
-			$c->query(IServerContainer::class)->getShareManager(),
+			$c->query(IServerContainer::class)->get(\OCP\Share\IManager::class),
 			$c->query(\OCP\BackgroundJob\IJobList::class)
 		);
 
diff --git a/tests/Unit/Controller/TracksControllerTest.php b/tests/Unit/Controller/TracksControllerTest.php
index a1bd011f4..abe771d2c 100644
--- a/tests/Unit/Controller/TracksControllerTest.php
+++ b/tests/Unit/Controller/TracksControllerTest.php
@@ -85,7 +85,7 @@ protected function setUp(): void {
 			$c->query(IServerContainer::class)->get(\Psr\Log\LoggerInterface::class),
 			$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
 			$this->rootFolder,
-			$c->query(IServerContainer::class)->getShareManager(),
+			$c->query(IServerContainer::class)->get(\OCP\Share\IManager::class),
 			$c->query(IServerContainer::class)->query(\OCP\IDBConnection::class)
 		);
 
@@ -94,7 +94,7 @@ protected function setUp(): void {
 			$this->request,
 			$c->query(IServerContainer::class),
 			$c->query(IServerContainer::class)->getConfig(),
-			$c->query(IServerContainer::class)->getShareManager(),
+			$c->query(IServerContainer::class)->get(\OCP\Share\IManager::class),
 			$c->getServer()->getAppManager(),
 			$c->getServer()->getUserManager(),
 			$c->getServer()->getGroupManager(),
@@ -108,7 +108,7 @@ protected function setUp(): void {
 			$this->request,
 			$c->query(IServerContainer::class),
 			$c->query(IServerContainer::class)->getConfig(),
-			$c->query(IServerContainer::class)->getShareManager(),
+			$c->query(IServerContainer::class)->get(\OCP\Share\IManager::class),
 			$c->getServer()->getAppManager(),
 			$c->getServer()->getUserManager(),
 			$c->getServer()->getGroupManager(),