diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json
index 3090437..ae86027 100644
--- a/source/_data/mastodon.json
+++ b/source/_data/mastodon.json
@@ -309,11 +309,21 @@
             "url": "https://fosstodon.org/@opensuse",
             "avatar": "/img/avatars/opensuse.png"
           },
+          {
+            "name": "Emmabuntus",
+            "url": "https://framapiaf.org/@Emmabuntus",
+            "avatar": "/img/avatars/emmabuntus.png"
+          },
           {
             "name": "PINE64",
             "url": "https://fosstodon.org/@PINE64",
             "avatar": "/img/avatars/pine64.png"
           },
+          {
+            "name": "mntmn hardware",
+            "url": "https://mastodon.social/@mntmn",
+            "avatar": "/img/avatars/mntmn.png"
+          },
           {
             "name": "Purism",
             "url": "https://mastodon.social/@Purism",
diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json
index a8fc611..a8b1604 100644
--- a/source/_data/miscellaneous.json
+++ b/source/_data/miscellaneous.json
@@ -445,7 +445,7 @@
       },
       {
         "title": "Osada",
-        "source": "https://framagit.org/zot/osada",
+        "source": "https://gitlab.com/apfed/osada",
         "protocols": "Zot",
         "site": "https://zotlabs.com/osada",
         "logo": "/img/misc/osada.svg",
diff --git a/source/img/avatars/emmabuntus.png b/source/img/avatars/emmabuntus.png
new file mode 100644
index 0000000..d5074df
Binary files /dev/null and b/source/img/avatars/emmabuntus.png differ
diff --git a/source/img/avatars/mntmn.png b/source/img/avatars/mntmn.png
new file mode 100644
index 0000000..9bed067
Binary files /dev/null and b/source/img/avatars/mntmn.png differ