diff --git a/infra/libkookie/configuration/users/spacekookie/default.nix b/infra/libkookie/configuration/users/spacekookie/default.nix
index c37c7e41d06..3477c24c21d 100644
--- a/infra/libkookie/configuration/users/spacekookie/default.nix
+++ b/infra/libkookie/configuration/users/spacekookie/default.nix
@@ -1,14 +1,17 @@
-{ lib, pkgs, ... }:
+{ lib, pkgs, ... } @ args:
 
+let klib = (import <modules/harness/lib.nix>) args;
+in
 {
   name = "spacekookie"; # FIXME: remove this redundancy
   cfg = {
+    isNormalUser = true;
     createHome = true;
     description = "Katharina Fey";
-    home = lib.mkDefault "/home";
-    uid = lib.mkDefault 1000;
+    home = klib.mkDefault "/home";
+    uid = klib.mkDefault 1000;
     extraGroups = [ "wheel" "dialout" "video" ];
-    shell = lib.mkDefault pkgs.fish;
+    shell = klib.mkDefault pkgs.fish;
   };
 
   pubkeys = [
diff --git a/infra/libkookie/configuration/workstation/creative/default.nix b/infra/libkookie/configuration/workstation/creative/default.nix
index f0599e033f9..1e2b3805fa5 100644
--- a/infra/libkookie/configuration/workstation/creative/default.nix
+++ b/infra/libkookie/configuration/workstation/creative/default.nix
@@ -9,7 +9,7 @@
 {
   home.packages = with pkgs;
     [
-      ardour audacity lmms
+      audacity
 
       kdenlive obs-studio
 
diff --git a/infra/libkookie/configuration/workstation/devel/default.nix b/infra/libkookie/configuration/workstation/devel/default.nix
index a276fa8beab..8ffeb74b67d 100644
--- a/infra/libkookie/configuration/workstation/devel/default.nix
+++ b/infra/libkookie/configuration/workstation/devel/default.nix
@@ -6,6 +6,8 @@ let
     .overrideAttrs ({ ...}: { doInstallCheck = false; });
 in
 {
+  imports = [ ./cad.nix ];
+  
   home.packages = with pkgs; [
 
     # Custom emacs with modules
diff --git a/infra/libkookie/modules/harness/lib.nix b/infra/libkookie/modules/harness/lib.nix
index 842f02adfd3..591ef06adb3 100644
--- a/infra/libkookie/modules/harness/lib.nix
+++ b/infra/libkookie/modules/harness/lib.nix
@@ -21,4 +21,6 @@ in
   # This function wraps around lib.recursiveUpdate to make it slighly
   # less cumbersome to work with in one-liners.
   patchAttrs = attrs: f: (lib.recursiveUpdate attrs (f attrs));
+
+  mkDefault = lib.mkOverride ((lib.mkDefault null).priority - 1);
 }
diff --git a/infra/libkookie/modules/workstation/mail/core/default.nix b/infra/libkookie/modules/workstation/mail/core/default.nix
index 58d372ffa12..e7d6dd2e50e 100644
--- a/infra/libkookie/modules/workstation/mail/core/default.nix
+++ b/infra/libkookie/modules/workstation/mail/core/default.nix
@@ -11,6 +11,7 @@ in
     createHome = true;
     inherit (cfg.access) group;
     home = "/var/lib/mail";
+    isSystemUser = true;
   };
 
   systemd.services.isync = (import ./isync.nix) args;
diff --git a/infra/libkookie/overlays/kookie/emacs/base/default.el b/infra/libkookie/overlays/kookie/emacs/base/default.el
index 906eca67304..498e249417d 100644
--- a/infra/libkookie/overlays/kookie/emacs/base/default.el
+++ b/infra/libkookie/overlays/kookie/emacs/base/default.el
@@ -12,6 +12,8 @@
 
 (provide 'base)
 
+(direnv-mode)
+
 ;;; Setup consistent line numbering
 (setq display-line-numbers-grow-only t)
 (setq display-line-numbers-width-start t)
diff --git a/infra/libkookie/overlays/kookie/emacs/base/default.nix b/infra/libkookie/overlays/kookie/emacs/base/default.nix
index 1c80398408d..157eed18701 100644
--- a/infra/libkookie/overlays/kookie/emacs/base/default.nix
+++ b/infra/libkookie/overlays/kookie/emacs/base/default.nix
@@ -1,3 +1,3 @@
 { buildModule, pkgs, epkgs }:
 with epkgs;
-(buildModule "base" ./. [ smex sublimity scad-mode protobuf-mode ])
+(buildModule "base" ./. [ direnv smex sublimity scad-mode protobuf-mode ])
diff --git a/infra/libkookie/overlays/kookie/emacs/default.nix b/infra/libkookie/overlays/kookie/emacs/default.nix
index 7cfbba3252d..5d20d515af2 100644
--- a/infra/libkookie/overlays/kookie/emacs/default.nix
+++ b/infra/libkookie/overlays/kookie/emacs/default.nix
@@ -30,11 +30,9 @@ pkgs.emacsWithPackages (epkgs:
       markdown-mode
       nim-mode
       nix-mode
-      python-mode
       raku-mode
 
       # Utility moduse
-      direnv
       fzf
       magit
       treemacs
diff --git a/infra/libkookie/overlays/kookie/funkwhale-frontend/default.nix b/infra/libkookie/overlays/kookie/funkwhale-frontend/default.nix
new file mode 100644
index 00000000000..ee6d4a9f4c5
--- /dev/null
+++ b/infra/libkookie/overlays/kookie/funkwhale-frontend/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  pname = "funkwhale-frontend";
+  version = "1.1";
+
+  src = fetchzip {
+    url = "https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/${version}/download?job=build_front&foo.zip";
+    sha256 = "0zddwd47ik3nrqpgkmvn4zx90w9708zjxlq0rr54vh5gzj326pgc";
+  };
+
+  installPhase = ''
+    cp -rv dist $out
+  '';
+}
diff --git a/infra/libkookie/roots/tempest.nix b/infra/libkookie/roots/tempest.nix
index 391a596b898..bff54f5ef3a 100644
--- a/infra/libkookie/roots/tempest.nix
+++ b/infra/libkookie/roots/tempest.nix
@@ -152,7 +152,10 @@ in
   networking.useDHCP = false;
   #networking.interfaces.enp8s0.useDHCP = true;
   networking.interfaces.eth0.useDHCP = true;
-  
+  networking.hosts = {
+    "10.7.1.3" = [ "music.kookiejar.tech" "media.kookiejar.tech" "cloud.kookiejar.tech" ];
+  };
+
   # Select internationalisation properties.
   i18n.defaultLocale = "en_GB.UTF-8";