diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json
index 3959253..d77408b 100644
--- a/source/_data/miscellaneous.json
+++ b/source/_data/miscellaneous.json
@@ -971,7 +971,7 @@
         "zotClass": false,
         "diasporaClass": false,
         "OStatusClass": false,
-        "categories": ["Other"]
+        "categories": ["SN-mi", "SN-ma"]
       },
       {
         "title": "Immers Space",
@@ -1083,21 +1083,21 @@
       },
       {
         "title": "ForgeFriends",
-        "source": "https://lab.fedeproxy.eu/forgefriends/forgefriends",
+        "source": "https://lab.forgefriends.org/forgefriends/forgefriends",
         "protocols": "ActivityPub",
         "site": "https://forgefriends.org",
         "logo": "/img/misc/forgefriends.svg",
         "servers": "",
         "description": "An online service to federate forges.",
-        "codeLanguage": "Python",
+        "codeLanguage": "Go",
         "techStack": "",
-        "license": "AGPL-3.0",
+        "license": "MIT",
         "FediAccount": "forgefriends@mastodon.online",
         "apClass": true,
         "zotClass": false,
         "diasporaClass": false,
         "OStatusClass": false,
-        "categories": ["Develop", "Other"]
+        "categories": ["Develop"]
       },
       {
         "title": "Flocking Bird",
@@ -1513,6 +1513,42 @@
         "OStatusClass": false,
         "categories": ["Extention"]
       },
+      {
+        "title": "ForgeFlux",
+        "source": "https://github.com/forgeflux-org/interface",
+        "protocols": "ActivityPub",
+        "site": "https://forgeflux.org/",
+        "logo": "",
+        "servers": "",
+        "description": "Forge federation will implement ForgeFed external, using the forge's HTTP APIs. Federation for Gitea, SourceHut, GitLab and GitHub will be implemented",
+        "codeLanguage": "Python",
+        "techStack": "",
+        "license": "AGPL-3.0",
+        "FediAccount": "@forgeflux@gts.batsense.net",
+        "apClass": true,
+        "zotClass": false,
+        "diasporaClass": false,
+        "OStatusClass": false,
+        "categories": ["Develop"]
+      },
+      {
+        "title": "Vervis",
+        "source": "https://vervis.peers.community/s/fr33domlover/r/vervis",
+        "protocols": "ActivityPub",
+        "site": "",
+        "logo": "",
+        "servers": "",
+        "description": "Decentralized project hosting and management platform. Reference implementation for ForgeFed   protocol extension.",
+        "codeLanguage": "Haskell",
+        "techStack": "",
+        "license": "AGPL-3.0",
+        "FediAccount": "@fr33domlover@todon.nl",
+        "apClass": true,
+        "zotClass": false,
+        "diasporaClass": false,
+        "OStatusClass": false,
+        "categories": ["Develop"]
+      },
       {
         "title": "diaspora*",
         "source": "https://github.com/diaspora/diaspora",
diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md
index e84d4a8..9294398 100644
--- a/source/en/portal/servers/index.md
+++ b/source/en/portal/servers/index.md
@@ -63,6 +63,7 @@ title: "Themed servers"
 * [moessingen.social](https://moessingen.social) - Mössingen area, Germany *(Mastodon)*
 * [graz.social](https://graz.social) - Graz, Austria *(Mastodon)*
 * [krems.social](https://krems.social) - Krems, Austria *(Mastodon)*
+* [fedi.at](https://fedi.at) - Austria *(Mastodon)*
 * [oslo.town](https://oslo.town) - Oslo, Norway *(Mastodon)*
 * [norrebro.space](https://norrebro.space) - Denmark *(Mastodon)*
 * [mastodon.nl](https:/mastodon.nl) - Netherlands *(Mastodon)*