diff --git a/components/hm/ssh.nix b/components/hm/ssh.nix
index cc21c43..235e8d4 100644
--- a/components/hm/ssh.nix
+++ b/components/hm/ssh.nix
@@ -115,7 +115,7 @@ in
       # LINODE SERVERS
       "l001" = {
         identityFile = age.secrets.nix2linode.path;
-        hostname = "172.236.111.33";
+        hostname = "172.236.111.33"; # Not on the tailscale network it is the primary host
         user = "root";
       };
       "l002_" = {
@@ -127,6 +127,16 @@ in
         identityFile = age.secrets.nix2linode.path;
         user = "root";
       };
+      # ORACLE SERVERS
+      "o001" = {
+        identityFile = age.secrets.nix2oracle.path;
+        user = "root";
+      };
+      "o001_" = {
+        identityFile = age.secrets.nix2oracle.path;
+        hostname = "64.181.210.7";
+        user = "root";
+      };
     };
   };
 }
diff --git a/hosts/linode/l002/flake.nix b/hosts/linode/l002/flake.nix
index 847445d..9f337ff 100644
--- a/hosts/linode/l002/flake.nix
+++ b/hosts/linode/l002/flake.nix
@@ -6,8 +6,6 @@
     ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
     mod_common.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_common";
     mod_common.inputs.nixpkgs.follows = "nixpkgs";
-    # mod_ros_stormd.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_stormd";
-    # mod_nebula.url = "git+https://git.joshuabell.xyz/dotfiles?ref=mod_nebula";
   };
 
   outputs =
@@ -61,12 +59,10 @@
                 { pkgs, ... }:
                 {
                   users.users.root.openssh.authorizedKeys.keys = [
-                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFLBVLiPbhVG+riNNpkvXnNtOioByV3CQwtY9gu8pstp nix2l002"
                     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuo6L6V52AzdQIK6fWW9s0aX1yKUUTXbPd8v8IU9p2o nix2linode"
                   ];
                   components = {
-                    # NOTE we manually onboard this machine since it also hosts headscale itself and I don't want to push
-                    # the key in this config.
+                    # NOTE we manually onboard this machine since it has no secrets uploaded to it
                     tailscale.useSecretsAuth = false;
                   };
                   mods = {
@@ -84,7 +80,6 @@
                           ];
                           isNormalUser = true;
                           openssh.authorizedKeys.keys = [
-                            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFLBVLiPbhVG+riNNpkvXnNtOioByV3CQwtY9gu8pstp nix2l002"
                             "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuo6L6V52AzdQIK6fWW9s0aX1yKUUTXbPd8v8IU9p2o nix2linode"
                           ];
                         };
diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix
index b00fc5d..f95433c 100644
--- a/hosts/lio/flake.nix
+++ b/hosts/lio/flake.nix
@@ -96,11 +96,9 @@
                             discordo
                             discord
                             firefox-esr
-                            # freecad
                             openscad
-                            # ladybird
-                            # ollama
                             vlc
+                            bitwarden
                           ];
                         };
                       };
diff --git a/hosts/oracle/o001/flake.nix b/hosts/oracle/o001/flake.nix
index abf57d1..aa7c6fe 100644
--- a/hosts/oracle/o001/flake.nix
+++ b/hosts/oracle/o001/flake.nix
@@ -54,12 +54,17 @@
               ./configuration.nix
               ./hardware-configuration.nix
               ./nginx.nix
+              ../../../components/nix/tailscale.nix
               (
                 { pkgs, ... }:
                 {
                   users.users.root.openssh.authorizedKeys.keys = [
                     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG90Gg6dV3yhZ5+X40vICbeBwV9rfD39/8l9QSqluTw8 nix2oracle"
                   ];
+                  components = {
+                    # NOTE we manually onboard this machine since it has no secrets uploaded to it
+                    tailscale.useSecretsAuth = false;
+                  };
                   mods = {
                     common = {
                       disableRemoteBuildsOnLio = true;