diff --git a/group_vars/all b/group_vars/all
index 153a69b..0d18355 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -9,8 +9,6 @@ dotfiles:
     url: git@github.com:pigmonkey/dotfiles.git
     rcup_flags: -x README.md
 
-hostname: nous
-
 aur:
     dir: aur
     packages:
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 03c65c5..130e7f9 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -7,6 +7,7 @@
 
 - name: Set the hostname
   hostname: name={{ hostname }}
+  when: hostname is defined
 
 - include: shell.yml
 - include: user.yml