diff --git a/common/nix-on-droid.nix b/common/nix-on-droid.nix
index 23b58c4c..95c8764a 100644
--- a/common/nix-on-droid.nix
+++ b/common/nix-on-droid.nix
@@ -62,6 +62,9 @@
           # Experimenting server
           servivi = "ssh -t matt@100.64.0.7 'tmux -2u new -At phone'";
 
+          # Home-assistant
+          homie = "ssh -t matt@100.64.0.10 'tmux -2u new -At phone'";
+
           # Cluster nodes
           thingone = "ssh -t matt@100.64.0.8 'tmux -2u new -At phone'";
           thingtwo = "ssh -t matt@100.64.0.9 'tmux -2u new -At phone'";
diff --git a/devices/README.md b/devices/README.md
index b7986c82..d61f513d 100644
--- a/devices/README.md
+++ b/devices/README.md
@@ -10,6 +10,7 @@ This directory encompasses every device's main configuration file.
 | `bbsteamie` | My wife's SteamDeck that has a pink case |
 | `binto`     | My desktop PC with a multi-monitor setup and an NVIDIA (cringe) 3070 |
 | `cluster`   | Two Lenovo mini PCs that make use of [NixOS-pcsd](https://github.com/matt1432/nixos-pcsd) to form a cluster |
+| `homie`     | My Lenovo mini PC that will serve as a Home-assistant server |
 | `nos`       | My custom built NAS |
 | `servivi`   | A gaming PC in a previous life, it is now used as a build farm and hosts game servers |
 | `wim`       | My 2-1 Lenovo Laptop that I use for uni |
diff --git a/nixosModules/server/sshd.nix b/nixosModules/server/sshd.nix
index ddc9e900..8c56cd0e 100644
--- a/nixosModules/server/sshd.nix
+++ b/nixosModules/server/sshd.nix
@@ -23,6 +23,7 @@ in {
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPE39uk52+NIDLdHeoSHIEsOUUFRzj06AGn09z4TUOYm matt@OP9"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICr2+CpqXNMLsjgbrYyIwTKhlVSiIYol1ghBPzLmUpKl matt@binto"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGbLu+Gb7PiyNgNXMHemaQLnKixebx1/4cdJGna9OQp matt@wim"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII1bYbOemBJHjm5onaRE52YvGiTAr+bS0l4tCjXSXud9 matt@servivi"
       ];
     };
   };
diff --git a/nixosModules/server/tailscale.nix b/nixosModules/server/tailscale.nix
index 735b5db4..de2773f8 100644
--- a/nixosModules/server/tailscale.nix
+++ b/nixosModules/server/tailscale.nix
@@ -37,6 +37,9 @@ in {
         # Experimenting server
         servivi = "ssh -t matt@servivi 'tmux -2u new -At ${hostName}'";
 
+        # Home-assistant
+        homie = "ssh -t matt@homie 'tmux -2u new -At ${hostName}'";
+
         # Cluster nodes
         thingone = "ssh -t matt@thingone 'tmux -2u new -At ${hostName}'";
         thingtwo = "ssh -t matt@thingtwo 'tmux -2u new -At ${hostName}'";