diff --git a/hosts/murk/configuration.nix b/hosts/murk/configuration.nix
index 8723d8f..b2beb5e 100644
--- a/hosts/murk/configuration.nix
+++ b/hosts/murk/configuration.nix
@@ -37,6 +37,7 @@ in {
     pkgs.qmk
     pkgs.jq
     pkgs.wireguard-tools
+    pkgs.opencode
   ];
 
   boot.binfmt = {
diff --git a/hosts/musk/configuration.nix b/hosts/musk/configuration.nix
index 23db205..01c73a2 100644
--- a/hosts/musk/configuration.nix
+++ b/hosts/musk/configuration.nix
@@ -37,6 +37,7 @@ in {
     pkgs.qmk
     pkgs.jq
     pkgs.wireguard-tools
+    pkgs.opencode
   ];
 
   boot.binfmt = {
diff --git a/hosts/musk/home.nix b/hosts/musk/home.nix
index 8bdfde8..b72bcdd 100644
--- a/hosts/musk/home.nix
+++ b/hosts/musk/home.nix
@@ -25,7 +25,6 @@ in {
   mods.desktop.productivity.enable = false;
   mods.zen.enable = true;
   mods.octo.enable = true;
-  mods.opencode.enable = true;
 
   home.packages = with pkgs;
     [
@@ -45,7 +44,7 @@ in {
       go
       rainfrog
       tealdeer
-      # (callPackage ./packages/mender-cli.nix {})
+      (callPackage ./packages/mender-cli.nix {})
     ]
     # Non-free </3
     ++ [google-cloud-sdk google-cloud-sql-proxy];
diff --git a/hosts/muvo/home.nix b/hosts/muvo/home.nix
index 9140639..27ec74f 100644
--- a/hosts/muvo/home.nix
+++ b/hosts/muvo/home.nix
@@ -27,6 +27,8 @@ in {
     pulseaudio
     pavucontrol
     alsa-utils
+
+    opencode
   ];
 
   # Hardware preferences