diff --git a/lib/logic/api_maps/rest_maps/api_factory_creator.dart b/lib/logic/api_maps/rest_maps/api_factory_creator.dart
index c835b0cd..662dd4f8 100644
--- a/lib/logic/api_maps/rest_maps/api_factory_creator.dart
+++ b/lib/logic/api_maps/rest_maps/api_factory_creator.dart
@@ -2,8 +2,8 @@ import 'package:selfprivacy/logic/api_maps/rest_maps/api_factory_settings.dart';
 import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_factory.dart';
 import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_factory.dart';
 import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/dns_provider_factory.dart';
-import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_factory.dart';
-import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_factory.dart';
+import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api_factory.dart';
+import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api_factory.dart';
 import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/server_provider_factory.dart';
 import 'package:selfprivacy/logic/models/hive/server_details.dart';
 import 'package:selfprivacy/logic/models/hive/server_domain.dart';
diff --git a/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean.dart b/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api.dart
similarity index 100%
rename from lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean.dart
rename to lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api.dart
diff --git a/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_factory.dart b/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api_factory.dart
similarity index 96%
rename from lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_factory.dart
rename to lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api_factory.dart
index 73a1e647..6383c4ab 100644
--- a/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_factory.dart
+++ b/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api_factory.dart
@@ -1,4 +1,4 @@
-import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean.dart';
+import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean_api.dart';
 import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/server_provider.dart';
 import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/server_provider_api_settings.dart';
 import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/server_provider_factory.dart';
diff --git a/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart b/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart
similarity index 100%
rename from lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart
rename to lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart
diff --git a/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_factory.dart b/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api_factory.dart
similarity index 97%
rename from lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_factory.dart
rename to lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api_factory.dart
index 5f8fcab5..6824d385 100644
--- a/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_factory.dart
+++ b/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api_factory.dart
@@ -1,4 +1,4 @@
-import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart';
+import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart';
 import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/server_provider.dart';
 import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/server_provider_api_settings.dart';
 import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/server_provider_factory.dart';
diff --git a/lib/logic/providers/server_providers/hetzner.dart b/lib/logic/providers/server_providers/hetzner.dart
new file mode 100644
index 00000000..e69de29b
diff --git a/lib/logic/providers/server_providers/server_provider_factory.dart b/lib/logic/providers/server_providers/server_provider_factory.dart
new file mode 100644
index 00000000..669ffbd6
--- /dev/null
+++ b/lib/logic/providers/server_providers/server_provider_factory.dart
@@ -0,0 +1,14 @@
+class ServerProviderFactory {
+  static ServerProvider createServerProviderApiFactory(
+    final ServerProviderApiFactorySettings settings,
+  ) {
+    switch (settings.provider) {
+      case ServerProvider.hetzner:
+        return HetznerApiFactory(region: settings.location);
+      case ServerProvider.digitalOcean:
+        return DigitalOceanApiFactory(region: settings.location);
+      case ServerProvider.unknown:
+        throw UnknownApiProviderException('Unknown server provider');
+    }
+  }
+}