diff --git a/_data/people/byb.yml b/_data/people/byb.yml
index f397a4e..9e59a11 100644
--- a/_data/people/byb.yml
+++ b/_data/people/byb.yml
@@ -7,7 +7,7 @@ contactOptions:
     link: 'mailto:byb@miom.space'
   - name: git
     value: '@b12f'
-    link: 'https://git.b12f.io/b12f'
+    link: 'https://git.pub.solar/b12f'
   - name: gpg
     value: 4332 E0D0 2B21 4D31 376C  366E 4406 E80E 13CD 656C
   - name: matrix
diff --git a/_data/people/jfw.yml b/_data/people/jfw.yml
index f999743..707aaeb 100644
--- a/_data/people/jfw.yml
+++ b/_data/people/jfw.yml
@@ -1,12 +1,15 @@
 name: Jhonas Wernery
 pronouns: he/him
-role: Systems Engineer
+role: System Administrator
 contactOptions:
   - name: mail
     value: jfw@miom.space
     link: 'mailto:jfw@miom.space'
   - name: git
     value: '@teutat3s'
-    link: 'https://git.b12f.io/teutat3s'
+    link: 'https://git.pub.solar/teutat3s'
   - name: matrix
     value: '@teutat3s:pub.solar'
+  - name: mastodon
+    value: '@teutat3s@pub.solar'
+    link: 'https://mastodon.pub.solar/@teutat3s'