diff --git a/machines/gerd/services/authelia/authelia-nginx.nix b/machines/gerd/services/authelia/authelia-nginx.nix
index 9fc08f8..35346fc 100644
--- a/machines/gerd/services/authelia/authelia-nginx.nix
+++ b/machines/gerd/services/authelia/authelia-nginx.nix
@@ -73,7 +73,7 @@ let
     
     ## Legacy Method: When there is a 401 response code from the authz endpoint redirect to the portal with the 'rd'
     ## URL parameter set to $target_url. This requires users update 'auth.example.com/' with their external authelia URL.
-    error_page 401 =302 https://auth.fricloud.dk/?rd=$target_url;
+    error_page 401 =302 https://${config.mine.shared.settings.authelia.domain}/?rd=$target_url;
   '';
 in {
   mine.shared.lib.authelia.mkProtectedWebsite = { vhostConfig, endpoint ? "/" }: lib.recursiveUpdate vhostConfig {
diff --git a/machines/gerd/services/member-website/default.nix b/machines/gerd/services/member-website/default.nix
index ce6f214..4e2ab71 100644
--- a/machines/gerd/services/member-website/default.nix
+++ b/machines/gerd/services/member-website/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   urlpath = "/members";
@@ -24,4 +24,21 @@ in {
       proxyPass = "http://localhost:${builtins.toString port}";
     };
   };
+
+  mine.shared.meta.website-members = {
+    name = "Members Website";
+    description = "This website you are looking at right now, which is our members website.";
+    url = "https://${config.mine.shared.settings.domain}${urlpath}";
+
+    package = {
+      name = "members-website";
+      version = "v0.0.1";
+      meta = with lib; {
+        description = "Members website for ${mine.shared.settings.domain}";
+        license = licenses.free;
+        homepage = "https://git.fricloud.dk/fricloud/server-configs/src/branch/main/machines/gerd/services/member-website/app.py";
+        platforms = platforms.all;
+      };
+    };
+  };
 }
diff --git a/machines/gerd/services/murmur.nix b/machines/gerd/services/murmur.nix
index ff8aa8e..7ee9372 100644
--- a/machines/gerd/services/murmur.nix
+++ b/machines/gerd/services/murmur.nix
@@ -14,7 +14,9 @@ in {
     
     environmentFile = config.age.secrets.murmur-env.path;
     password = "$MURMUR_PASSWORD";
-    welcometext = "Welcome to Friclouds Mumble server!";
+    welcometext = ''Welcome to ${config.mine.shared.settings.brand}s Mumble server!
+      Feel free to join our Teeworlds server while waiting. Credentials can be found on the members website here ${config.mine.shared.meta.website-members.url}.
+    '';
 
     bandwidth = 130000;
   };
diff --git a/machines/gerd/services/teeworlds.nix b/machines/gerd/services/teeworlds.nix
index e43cdbe..738d370 100644
--- a/machines/gerd/services/teeworlds.nix
+++ b/machines/gerd/services/teeworlds.nix
@@ -11,10 +11,10 @@
     password = "$TEEWORLDS_PASSWORD";
   };
 
-  mine.shared.meta.teeworlds = {
+  mine.shared.meta.teeworlds = rec {
     name = "Teeworlds";
-    description = ''We host our own Teeworlds instance. Connect using `nix-shell -p teeworlds --run 'teeworlds "connect teeworlds.fricloud.dk" "password {{secrets.TEEWORLDS_PASSWORD}}"'`, the password is {{secrets.TEEWORLDS_PASSWORD}}'';
-    url = "";
+    description = ''We host our own Teeworlds instance. Connect using `nix-shell -p teeworlds --run 'teeworlds "connect ${url}" "password {{secrets.TEEWORLDS_PASSWORD}}"'`, the password is {{secrets.TEEWORLDS_PASSWORD}}'';
+    url = "teeworlds.${config.mine.shared.settings.domain}";
 
     secrets.auth = config.age.secrets.teeworlds-env.path;