diff --git a/source/_data/friendica.json b/source/_data/friendica.json
index b2d5acf..eaf09ed 100644
--- a/source/_data/friendica.json
+++ b/source/_data/friendica.json
@@ -22,7 +22,7 @@
         [
           {"num": "1", "url": "https://the-federation.info/friendica"},
           {"num": "2", "url": "https://dir.friendica.social/servers"},
-          {"num": "3", "url": "https://fedidb.org/network/?s=friendica"},
+          {"num": "3", "url": "https://fedidb.org/software/friendica"},
           {"num": "4", "url": "https://friendica.fediverse.observer/list"}
         ],
       "serverWizard": "https://fediverse.observer/list?wizard",
diff --git a/source/_data/funkwhale.json b/source/_data/funkwhale.json
index 7bf97e2..6a33794 100644
--- a/source/_data/funkwhale.json
+++ b/source/_data/funkwhale.json
@@ -19,7 +19,7 @@
         [
           {"num": "1", "url": "https://network.funkwhale.audio/dashboards/d/overview/network-overview"},
           {"num": "2", "url": "https://the-federation.info/funkwhale"},
-          {"num": "3", "url": "https://fedidb.org/network/?s=funkwhale"},
+          {"num": "3", "url": "https://fedidb.org/software/funkwhale"},
           {"num": "4", "url": "https://funkwhale.fediverse.observer/list"}
         ],
       "mobile": "https://funkwhale.audio/en_US/apps",
diff --git a/source/_data/gnusocial.json b/source/_data/gnusocial.json
index 5ba7532..a993171 100644
--- a/source/_data/gnusocial.json
+++ b/source/_data/gnusocial.json
@@ -20,7 +20,7 @@
       "servers":
         [
           {"num": "1", "url": "https://the-federation.info/gnusocial"},
-          {"num": "2", "url": "https://fedidb.org/network/?s=gnusocial"},
+          {"num": "2", "url": "https://fedidb.org/software/gnusocial"},
           {"num": "3", "url": "https://gnusocial.fediverse.observer/list"}
         ],
       "mobile": "",
diff --git a/source/_data/hubzilla.json b/source/_data/hubzilla.json
index 8ac29e3..7507ee4 100644
--- a/source/_data/hubzilla.json
+++ b/source/_data/hubzilla.json
@@ -22,7 +22,7 @@
       "servers":
         [
           {"num": "1", "url": "https://the-federation.info/hubzilla"},
-          {"num": "2", "url": "https://fedidb.org/network/?s=hubzilla"},
+          {"num": "2", "url": "https://fedidb.org/software/hubzilla"},
           {"num": "3", "url": "https://hubzilla.fediverse.observer/list"}
         ],
       "mobile": "https://f-droid.org/en/packages/com.dfa.hubzilla_android",
diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json
index 2b63147..2c59a7b 100644
--- a/source/_data/mastodon.json
+++ b/source/_data/mastodon.json
@@ -18,8 +18,8 @@
       "wiki": "",
       "servers":
         [
-          {"num": "1", "url": "https://the-federation.info/mastodon"},
-          {"num": "2", "url": "/en/portal/servers"},
+          {"num": "1", "url": "/en/portal/servers"},
+          {"num": "2", "url": "https://the-federation.info/mastodon"},
           {"num": "3", "url": "https://instances.social"},
           {"num": "4", "url": "https://mastodon.fediverse.observer/list"}
 
diff --git a/source/_data/misskey.json b/source/_data/misskey.json
index 61e0010..9d2b8c6 100644
--- a/source/_data/misskey.json
+++ b/source/_data/misskey.json
@@ -20,7 +20,7 @@
           {"num": "1", "url": "https://misskey-hub.net/en/instances.html"},
           {"num": "2", "url": "https://join.misskey.page/en/wiki/instances"},
           {"num": "3", "url": "https://the-federation.info/misskey"},
-          {"num": "4", "url": "https://fedidb.org/network/?s=misskey"},
+          {"num": "4", "url": "https://fedidb.org/software/misskey"},
           {"num": "5", "url": "https://misskey.fediverse.observer/list"}
         ],
       "mobile": "https://misskey-hub.net/en/docs/faq.html",
diff --git a/source/_data/peertube.json b/source/_data/peertube.json
index 064eb4a..7408ecf 100644
--- a/source/_data/peertube.json
+++ b/source/_data/peertube.json
@@ -19,7 +19,7 @@
         [
           {"num": "1", "url": "https://joinpeertube.org/instances"},
           {"num": "2", "url": "https://the-federation.info/peertube"},
-          {"num": "3", "url": "https://fedidb.org/network/?s=peertube"},
+          {"num": "3", "url": "https://fedidb.org/software/peertube"},
           {"num": "4", "url": "https://peertube.fediverse.observer/list"}
         ],
       "mobile": "https://docs.joinpeertube.org/#/use-third-party-application",
diff --git a/source/_data/pixelfed.json b/source/_data/pixelfed.json
index 99bfe50..34552bc 100644
--- a/source/_data/pixelfed.json
+++ b/source/_data/pixelfed.json
@@ -19,7 +19,7 @@
       "servers":
         [
           {"num": "1", "url": "https://the-federation.info/pixelfed"},
-          {"num": "2", "url": "https://fedidb.org/network/?s=pixelfed"},
+          {"num": "2", "url": "https://fedidb.org/software/pixelfed"},
           {"num": "3", "url": "https://pixelfed.fediverse.observer/list"}
         ],
       "mobile": "https://github.com/glitchpizza/morii",
diff --git a/source/_data/pleroma.json b/source/_data/pleroma.json
index 7e8fd0f..2712367 100644
--- a/source/_data/pleroma.json
+++ b/source/_data/pleroma.json
@@ -18,7 +18,7 @@
       "servers":
         [
           {"num": "1", "url": "https://the-federation.info/pleroma"},
-          {"num": "2", "url": "https://fedidb.org/network/?s=pleroma"},
+          {"num": "2", "url": "https://fedidb.org/software/pleroma"},
           {"num": "3", "url": "https://pleroma.fediverse.observer/list"}
         ],
       "mobile": "https://docs-develop.pleroma.social/backend/clients",