diff --git a/upgrade.sh b/upgrade.sh
index d84c633..0f62882 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -1,25 +1,25 @@
 #!/usr/bin/env sh
+set -e
+
 HOST=`hostname`
 echo "Upgrading $HOST"
 case "$HOST" in
   odin)
     echo "Found odin"
-    nix-channel --update
-    sudo nix-channel --update
-    sudo nixos-rebuild boot -p Intel -I "nixos-config=./nixos/odin-intel.nix "&&
-    sudo nixos-rebuild boot -p Nvidia -I "nixos-config=./nixos/odin-nvidia.nix"
+    sudo nixos-rebuild boot --upgrade -p Intel -I "nixos-config=./nixos/odin-intel.nix "
+    sudo nixos-rebuild boot --upgrade -p Nvidia -I "nixos-config=./nixos/odin-nvidia.nix"
     ;;
   thor | freya | loki)
     echo "Found $HOST"
-    nix-channel --update
-    sudo nix-channel --update
-    sudo nixos-rebuild boot -I "nixos-config=./nixos/$HOST.nix"
+    sudo nixos-rebuild boot --upgrade -I "nixos-config=./nixos/$HOST.nix"
     ;;
   *)
     echo "localhost match not found"
     exit 1
     ;;
-esac &&
+esac
+
+nix-channel --update
 home-manager switch
 
 echo DONE