diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart
index 1cd090c61..cedef2c13 100644
--- a/lib/config/app_config.dart
+++ b/lib/config/app_config.dart
@@ -50,8 +50,8 @@ abstract class AppConfig {
 
   static final Uri homeserverList = Uri(
     scheme: 'https',
-    host: 'servers.joinmatrix.org',
-    path: 'servers.json',
+    host: 'raw.githubusercontent.com',
+    path: 'krille-chan/fluffychat/refs/heads/main/recommended_homeservers.json',
   );
 
   static final Uri privacyUrl = Uri(
diff --git a/recommended_homeservers.json b/recommended_homeservers.json
new file mode 100644
index 000000000..1e263a9a5
--- /dev/null
+++ b/recommended_homeservers.json
@@ -0,0 +1,40 @@
+{
+    "public_servers": [
+        {
+            "name": "matrix.org",
+            "description": "The Matrix.org Foundation offers the matrix.org homeserver as an easy entry point for anyone wanting to try out Matrix.",
+            "reg_method": "oidc",
+            "languages": [
+                "All",
+                "English"
+            ]
+        },
+        {
+            "name": "converser.eu",
+            "description": "A free and decentralized communication server.",
+            "reg_method": "oidc",
+            "languages": [
+                "All",
+                "Français"
+            ]
+        },
+        {
+            "name": "mozilla.org",
+            "description": "Matrix homeserver hosted by Mozilla.",
+            "reg_method": "oidc",
+            "languages": [
+                "All",
+                "English"
+            ]
+        },
+        {
+            "name": "frei.chat",
+            "description": "frei.chat was opened on January 23rd, 2022 and enjoys new users every day.",
+            "reg_method": "oidc",
+            "languages": [
+                "All",
+                "Deutsch"
+            ]
+        }
+    ]
+}
\ No newline at end of file