diff --git a/config/home.nix b/config/home.nix
index 31ded5d..4209316 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -78,6 +78,7 @@
 	xcolor
 
 	# Dev
+	gh
 	yarn
 	plantuml
 	go
@@ -90,8 +91,6 @@
 	ranger
 	tesseract4
 	k9s
-	kubectl
-	kubernetes
 
 	#LSP
     nil
diff --git a/flake.nix b/flake.nix
index 739a539..2de38ac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,6 +65,13 @@
 		};
         modules = [./maskiner/jobb/configuration.nix];
       };
+      work-desktop = nixpkgs.lib.nixosSystem {
+        specialArgs = {
+			inherit inputs outputs;
+			myhostname = "work-desktop";
+		};
+        modules = [./maskiner/work-desktop/configuration.nix];
+      };
     };
 
     # Standalone home-manager configuration entrypoint
@@ -108,6 +115,19 @@
 			({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-fw-pkgs ]; })
 		];
       };
+      "fw@work-desktop" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = {
+			inherit inputs outputs;
+			myhostname = "work-desktop";
+		};
+        # > Our main home-manager configuration file <
+        modules = [
+			./config/home.nix
+			({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+			({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-fw-pkgs ]; })
+		];
+      };
     };
   };
 }
diff --git a/maskiner/jobb/configuration.nix b/maskiner/jobb/configuration.nix
index ad2c2c6..64e3429 100644
--- a/maskiner/jobb/configuration.nix
+++ b/maskiner/jobb/configuration.nix
@@ -15,6 +15,14 @@
 	../../config/users.nix
   ];
 
+  	environment.systemPackages = with pkgs; [
+		kubectl
+		azure-cli
+	];
+
+
+
+
   networking.hostName = myhostname;
 
 	# services.k3s = {
diff --git a/shared/fish.nix b/shared/fish.nix
index 15eda73..e4f9af6 100644
--- a/shared/fish.nix
+++ b/shared/fish.nix
@@ -51,7 +51,7 @@
 		  latest="git log | head -1 | awk '{print $2;}' | xsel -i";
 	  };
 	  interactiveShellInit = ''
-	  	fish_vi_key_bindings
+		fish_vi_key_bindings
 		set fish_greeting # Disable greeting
 		set FLAKE_DIR "/home/fw/nix"
 		set HM_DIR "$FLAKE_DIR#fw@jobb"
diff --git a/shared/ssh.nix b/shared/ssh.nix
index d85680e..0537ab8 100644
--- a/shared/ssh.nix
+++ b/shared/ssh.nix
@@ -32,18 +32,30 @@
         user = "fw";
         identityFile = "/home/fw/.ssh/fw-ssh-key";
       };
-      "ba6" = {
-        hostname = "buildagent6";
+      "ha2" = {
+        hostname = "192.168.0.133";
         port = 22;
         user = "fw";
         identityFile = "/home/fw/.ssh/fw-ssh-key";
       };
-      "ba2" = {
+      "ha3" = {
         hostname = "192.168.0.120";
         port = 22;
         user = "fw";
         identityFile = "/home/fw/.ssh/fw-ssh-key";
       };
+      "ha4" = {
+        hostname = "192.168.0.52";
+        port = 22;
+        user = "fw";
+        identityFile = "/home/fw/.ssh/fw-ssh-key";
+      };
+      "mac" = {
+        hostname = "192.168.0.149";
+        port = 22;
+        user = "ifacts";
+        identityFile = "/home/fw/.ssh/ifacts-ssh-key";
+      };
       "backups" = {
         hostname = "192.168.0.120";
         port = 22;
@@ -62,18 +74,6 @@
         user = "fw";
         identityFile = "/home/fw/.ssh/fw-ssh-key";
       };
-      "kub1" = {
-        hostname = "192.168.0.52";
-        port = 22;
-        user = "fw";
-        identityFile = "/home/fw/.ssh/fw-ssh-key";
-      };
-      "mac" = {
-        hostname = "192.168.0.206";
-        port = 22;
-        user = "ifacts";
-        identityFile = "/home/fw/.ssh/ifacts-ssh-key";
-      };
       "malmo" = {
         hostname = "192.168.0.138";
         port = 22;
@@ -86,11 +86,17 @@
         user = "root";
       };
       "disa" = {
-        hostname = "192.168.1.242";
-        port = 22;
+        hostname = "62.63.222.22";
+        port = 55505;
         user = "disah";
         identityFile = "/home/fw/.ssh/id_rsa";
       };
+      "laptop" = {
+        hostname = "62.63.222.22";
+        port = 55504;
+        user = "fw";
+        identityFile = "/home/fw/.ssh/id_rsa";
+      };
     };
   };
 }