diff --git a/hosts/janeway/default.nix b/hosts/janeway/default.nix
index 54c0975..a51c69a 100644
--- a/hosts/janeway/default.nix
+++ b/hosts/janeway/default.nix
@@ -6,7 +6,6 @@
 }: let
   sshdTmpDirectory = "${config.user.home}/sshd-tmp";
   sshdDirectory = "${config.user.home}/sshd";
-  pathToPubKey = "/mnt/sdcard/Download/picard_host_key.pub";
   port = 8022;
 in {
   # Backup etc files instead of failing to activate generation if a file already exists in /etc
@@ -23,9 +22,16 @@ in {
   # Set your time zone
   time.timeZone = "Europe/Rome";
 
-  build.activation.sshd = ''
+  build.activation.sshd = let
+    keys = (builtins.import ../../lib).keys;
+    inherit (keys) hosts users;
+  in ''
     $DRY_RUN_CMD mkdir $VERBOSE_ARG --parents "${config.user.home}/.ssh"
-    $DRY_RUN_CMD cat ${pathToPubKey} > "${config.user.home}/.ssh/authorized_keys"
+    $DRY_RUN_CMD echo ${hosts.picard} > "${config.user.home}/.ssh/authorized_keys"
+    $DRY_RUN_CMD echo ${hosts.sisko} >> "${config.user.home}/.ssh/authorized_keys"
+    $DRY_RUN_CMD echo ${hosts.kirk} >> "${config.user.home}/.ssh/authorized_keys"
+    $DRY_RUN_CMD echo ${users.ccr-ssh} >> "${config.user.home}/.ssh/authorized_keys"
+    $DRY_RUN_CMD echo ${users.ccr-gpg} >> "${config.user.home}/.ssh/authorized_keys"
 
     if [[ ! -d "${sshdDirectory}" ]]; then
       $DRY_RUN_CMD rm $VERBOSE_ARG --recursive --force "${sshdTmpDirectory}"
@@ -48,6 +54,7 @@ in {
     pkgs.stress
     pkgs.openssh
     pkgs.git
+    pkgs.btop
     (pkgs.writeScriptBin "sshd-start" ''
       #!${pkgs.runtimeShell}
 
diff --git a/hosts/module.nix b/hosts/module.nix
index 9f3f4b0..3c26ae6 100644
--- a/hosts/module.nix
+++ b/hosts/module.nix
@@ -291,6 +291,7 @@ in {
       internal = true;
       default = hostname: config:
         inputs.nix-on-droid.lib.nixOnDroidConfiguration {
+          pkgs = inputs.nixpkgsUnstable.legacyPackages.aarch64-linux;
           modules = [
             ({
               lib,
@@ -298,6 +299,7 @@ in {
               ...
             }: {
               nixpkgs.overlays = config.overlays;
+              _module.args.fleetFlake = self;
             })
             "${self.outPath}/hosts/${hostname}"
           ];