diff --git a/base.nix b/base.nix
index a11ee84..b6cc22a 100644
--- a/base.nix
+++ b/base.nix
@@ -73,6 +73,7 @@
 
   # Trusted users on the nix builder machines
   users.groups."nix-builder-users".name = "nix-builder-users";
+  users.motd = builtins.readFile ./misc/motd;
 
   services.openssh = {
     enable = true;
diff --git a/hosts/buskerud/bikkje.nix b/hosts/buskerud/bikkje.nix
index 9fd8d20..67f15b6 100644
--- a/hosts/buskerud/bikkje.nix
+++ b/hosts/buskerud/bikkje.nix
@@ -80,10 +80,14 @@
           PubkeyAcceptedAlgorithms=+ssh-rsa
        '';
 
-        settings.GatewayPorts = "yes";
-        banner = builtins.readFile ../../motd;
+        settings = {
+          GatewayPorts = "yes";
+          PermitRootLogin = "yes";
+        };
       };
 
+      users.motd = builtins.readFile ../../misc/motd;
+
       networking = {
         firewall.enable = true;
         # Use systemd-resolved inside the container
diff --git a/motd b/misc/motd
similarity index 100%
rename from motd
rename to misc/motd