diff --git a/src/routes/contact/+page.svelte b/src/routes/contact/+page.svelte
index f23e515..850a6b1 100644
--- a/src/routes/contact/+page.svelte
+++ b/src/routes/contact/+page.svelte
@@ -20,7 +20,7 @@
 
 <p>
 	We have an XMPP MUC for general discussion about Project Segfault over at <a
-		href="general@conference.projectsegfau.lt?join">this link</a
+		href="https://join.jabber.network/#general@conference.projectsegfau.lt?join">this link</a
 	>.
 </p>
 
diff --git a/src/routes/pubnix/User.svelte b/src/routes/pubnix/User.svelte
index 16184c9..d23d0a6 100644
--- a/src/routes/pubnix/User.svelte
+++ b/src/routes/pubnix/User.svelte
@@ -70,7 +70,7 @@
 
 		{#if user.capsule}
 			<a
-				href={user.capsule}
+				href="https://geminiproxy.p.projectsegfau.lt/gemini/{user.capsule}"
 				class="no-underline text-base">Gemini</a
 			>
 		{/if}
diff --git a/src/routes/pubnix/faq/+page.svelte b/src/routes/pubnix/faq/+page.svelte
index 543ee65..2324624 100644
--- a/src/routes/pubnix/faq/+page.svelte
+++ b/src/routes/pubnix/faq/+page.svelte
@@ -41,6 +41,6 @@
 	>Yep! We have a <a href="https://matrix.to/#/#pubnix:projectsegfau.lt"
 		>Matrix room</a
 	>
-	and an <a href="xmpp:pubnix@conference.projectsegfau.lt?join">XMPP MUC</a> to
+	and an <a href="https://join.jabber.network/#pubnix@conference.projectsegfau.lt?join">XMPP MUC</a> to
 	discuss the pubnix.</span
 >
diff --git a/src/routes/team/Team.json b/src/routes/team/Team.json
index e576ec3..ccd5a3b 100644
--- a/src/routes/team/Team.json
+++ b/src/routes/team/Team.json
@@ -11,7 +11,7 @@
 		"position": "Sysadmin",
 		"website": "https://arya.projectsegfau.lt",
 		"matrix": "https://matrix.to/#/@aryak:projectsegfau.lt",
-		"xmpp": "xmpp:arya@projectsegfau.lt",
+		"xmpp": "https://join.jabber.network/#arya@projectsegfau.lt",
 		"fedi": "https://social.projectsegfau.lt/aryak",
 		"git": "https://codeberg.org/aryak",
 		"email": "arya@projectsegfau.lt",