diff --git a/compose.yml b/compose.yml
index e43d826..8d74c6f 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,7 +1,7 @@
 services:
     website:
         container_name: website
-        image: ghcr.io/ProjectSegfault/website:latest
+        image: ghcr.io/projectsegfault/website:latest
         restart: unless-stopped
         # uncomment these lines if you want to build from source
         #build:
diff --git a/src/lib/Nav/Nav.svelte b/src/lib/Nav/Nav.svelte
index cd5a4dc..e7e49ba 100644
--- a/src/lib/Nav/Nav.svelte
+++ b/src/lib/Nav/Nav.svelte
@@ -28,7 +28,7 @@
 	const menus = [
 		{ name: "Instances", url: "/instances" },
 		{ name: "Donate", url: "/donate" },
-		// { name: "Pubnix", url: "/pubnix" },
+		{ name: "Pubnix", url: "/pubnix" },
 		{ name: "Contact", url: "/contact" },
 		{ name: "Team", url: "/team" },
 		{
diff --git a/src/routes/pubnix/User.svelte b/src/routes/pubnix/User.svelte
index e6a3621..5b4b8b7 100644
--- a/src/routes/pubnix/User.svelte
+++ b/src/routes/pubnix/User.svelte
@@ -53,11 +53,11 @@
 		{/if}
 
 		{#if user.matrix}
-			<a href={user.matrix}><div class="i-simple-icons:matrix" /></a>
+			<a href="https://matrix.to/#/{user.matrix}"><div class="i-simple-icons:matrix" /></a>
 		{/if}
 
 		{#if user.fediverse}
-			<a href={user.fediverse}><div class="i-simple-icons:mastodon" /></a>
+			<a href="https://{user.fediverse}"><div class="i-simple-icons:mastodon" /></a>
 		{/if}
 
 		{#if user.website}
diff --git a/src/routes/pubnix/faq/+page.svelte b/src/routes/pubnix/faq/+page.svelte
index 2cc1017..2cbc9a4 100644
--- a/src/routes/pubnix/faq/+page.svelte
+++ b/src/routes/pubnix/faq/+page.svelte
@@ -8,6 +8,37 @@
 
 <h2>What is a pubnix?</h2>
 <span
-	>A pubnix is a [[Unix?]] server provided by a person or a group to a group
-	for non-commercial recreational goals.</span
+	>A pubnix is a Unix server provided by a person or a group to the public
+	with non-commercial recreational goals.</span
+>
+<span
+	>A pubnix is a server running UNIX or a UNIX-like operating system that is
+	opened to the public.</span
+>
+<h2>What can I do on the pubnix?</h2>
+<span
+	>Quite a lot! You can run containers, set up a website, and learn
+	some amount of Linux system administration.</span
+>
+<h2>How do I get started?</h2>
+<span
+	>First, you need to register an account. You can do that <a
+		href="/pubnix/register">here</a
+	>. After registering, you need to wait a while because we manually check
+	each registration. If you get accepted, you will receive an email.</span
+>
+<h2>What's your systems specs?</h2>
+<span>Guess you'll have to find out. Join today!</span>
+<h2>I joined, but I have no idea what to do.</h2>
+<span
+	>No worries! We have put out tutorials on how to do common things on our <a
+		href="https://wiki.projectsegfau.lt/index.php?title=Category%3APubnix"
+		>wiki</a
+	>.</span
+>
+<h2>Do you have a place to discuss the pubnix?</h2>
+<span
+	>Yep! We have a <a href="https://matrix.to/#/#pubnix:projectsegfau.lt"
+		>Matrix room</a
+	> to discuss the pubnix.</span
 >