diff --git a/machines/jimbo/configuration.nix b/machines/jimbo/configuration.nix
index ebf9052..d109828 100644
--- a/machines/jimbo/configuration.nix
+++ b/machines/jimbo/configuration.nix
@@ -43,11 +43,6 @@ in
 
   networking.hostName = "jimbo"; # Define your hostname.
 
-  networking.extraHosts =
-    ''
-      10.10.37.136 homer.fleaz.me
-    '';
-
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 
diff --git a/roles/all.nix b/roles/all.nix
index 12a0484..65ebf23 100644
--- a/roles/all.nix
+++ b/roles/all.nix
@@ -11,5 +11,15 @@
     ../modules/docker.nix
     ../users/fleaz.nix
   ];
+
+
+  # Temporary hacks that don't deserve their own module
+
+  networking.extraHosts =
+    ''
+      10.10.37.136 bart2.fleaz.me
+      10.10.37.145 homer.fleaz.me
+    '';
+
 }