diff --git a/lib/logic/cubit/server_installation/server_installation_cubit.dart b/lib/logic/cubit/server_installation/server_installation_cubit.dart
index e6ad9be1..d6928e40 100644
--- a/lib/logic/cubit/server_installation/server_installation_cubit.dart
+++ b/lib/logic/cubit/server_installation/server_installation_cubit.dart
@@ -113,22 +113,21 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
   }
 
   Future<List<ServerProviderLocation>> fetchAvailableLocations() async {
-    if (ApiController.currentServerProviderApiFactory == null) {
+    if (ProvidersController.currentServerProvider == null) {
       return [];
     }
 
-    final APIGenericResult apiResult = await ApiController
-        .currentServerProviderApiFactory!
-        .getServerProvider()
+    final APIGenericResult apiResponse = await ProvidersController
+        .currentServerProvider!
         .getAvailableLocations();
 
-    if (!apiResult.success) {
+    if (!apiResponse.success) {
       getIt<NavigationService>().showSnackBar(
         'initializing.could_not_connect'.tr(),
       );
     }
 
-    return apiResult.data;
+    return apiResponse.data;
   }
 
   Future<List<ServerType>> fetchAvailableTypesByLocation(
@@ -138,10 +137,9 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
       return [];
     }
 
-    final APIGenericResult apiResult = await ApiController
-        .currentServerProviderApiFactory!
-        .getServerProvider()
-        .getServerTypesByLocation(location: location);
+    final APIGenericResult apiResult = await ProvidersController
+        .currentServerProvider!
+        .getServerTypes(location: location);
 
     if (!apiResult.success) {
       getIt<NavigationService>().showSnackBar(
diff --git a/lib/logic/providers/server_provider.dart b/lib/logic/providers/server_provider.dart
index 15475715..aca7f477 100644
--- a/lib/logic/providers/server_provider.dart
+++ b/lib/logic/providers/server_provider.dart
@@ -1,5 +1,12 @@
 import 'package:selfprivacy/logic/api_maps/api_generic_result.dart';
+import 'package:selfprivacy/logic/models/server_provider_location.dart';
+import 'package:selfprivacy/logic/models/server_type.dart';
 
 abstract class ServerProvider {
   Future<APIGenericResult<bool>> isApiTokenValid(final String apiToken);
+  Future<APIGenericResult<List<ServerProviderLocation>>>
+      getAvailableLocations();
+  Future<APIGenericResult<List<ServerType>>> getServerTypes({
+    required final ServerProviderLocation location,
+  });
 }