diff --git a/flake.nix b/flake.nix
index 240d144..5b46e25 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,12 +77,12 @@
           nixvim.homeManagerModules.nixvim
         ];
       };
-      "gabe@workstation" = home-manager.lib.homeManagerConfiguration {
+      "gabe@gv-workstation" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
         extraSpecialArgs = {inherit inputs outputs;};
         # > Our main home-manager configuration file <
         modules = [
-          ./hosts/gabe-workstation.nix
+          ./hosts/gabe-gv-workstation.nix
           nixvim.homeManagerModules.nixvim
         ];
       };
diff --git a/hosts/gabe-workstation.nix b/hosts/gabe-gv-workstation.nix
similarity index 100%
rename from hosts/gabe-workstation.nix
rename to hosts/gabe-gv-workstation.nix
diff --git a/justfile b/justfile
index 3763e65..f765370 100644
--- a/justfile
+++ b/justfile
@@ -1,16 +1,16 @@
 default:
     just --list
 
-nixos target:
+nixos target=`hostname`:
     sudo nixos-rebuild --flake .#{{target}} switch
 
-home-manager target:
+home-manager target=(`whoami`+"@"+`hostname`):
     home-manager --flake .#{{target}} switch
 
-check-home-manager target:
+check-home-manager target=(`whoami`+"@"+`hostname`):
     home-manager build --no-out-link --flake .#{{target}}
 
-bootstrap-home-manager target:
+bootstrap-home-manager target=(`whoami`+"@"+`hostname`):
     nix run --extra-experimental-features "nix-command flakes" --no-write-lock-file github:nix-community/home-manager/ -- --extra-experimental-features "nix-command flakes" --flake .#{{target}} switch
 
 format: