diff --git a/nix/modules/nixos/features/homelab/beaverhabits.nix b/nix/modules/nixos/features/homelab/containers/beaverhabits.nix
similarity index 100%
rename from nix/modules/nixos/features/homelab/beaverhabits.nix
rename to nix/modules/nixos/features/homelab/containers/beaverhabits.nix
diff --git a/nix/modules/nixos/features/homelab/containers/default.nix b/nix/modules/nixos/features/homelab/containers/default.nix
new file mode 100644
index 0000000..41013da
--- /dev/null
+++ b/nix/modules/nixos/features/homelab/containers/default.nix
@@ -0,0 +1,8 @@
+{
+  imports = [
+    ./beaverhabits.nix
+    ./freshrss.nix
+    ./pi-hole.nix
+    ./tubearchivist.nix
+  ];
+}
diff --git a/nix/modules/nixos/features/homelab/freshrss.nix b/nix/modules/nixos/features/homelab/containers/freshrss.nix
similarity index 100%
rename from nix/modules/nixos/features/homelab/freshrss.nix
rename to nix/modules/nixos/features/homelab/containers/freshrss.nix
diff --git a/nix/modules/nixos/features/homelab/pi-hole.nix b/nix/modules/nixos/features/homelab/containers/pi-hole.nix
similarity index 96%
rename from nix/modules/nixos/features/homelab/pi-hole.nix
rename to nix/modules/nixos/features/homelab/containers/pi-hole.nix
index 80a6f8d..2a3bf83 100644
--- a/nix/modules/nixos/features/homelab/pi-hole.nix
+++ b/nix/modules/nixos/features/homelab/containers/pi-hole.nix
@@ -27,6 +27,8 @@ in
           image = "pihole/pihole:latest";
 
           environment = {
+            "PIHOLE_DNS_1" = "8.8.8.8";
+            "PIHOLE_DNS_2" = "8.8.4.4";
             "TZ" = "Europe/London";
           };
 
diff --git a/nix/modules/nixos/features/homelab/tubearchivist-container.nix b/nix/modules/nixos/features/homelab/containers/tubearchivist.nix
similarity index 100%
rename from nix/modules/nixos/features/homelab/tubearchivist-container.nix
rename to nix/modules/nixos/features/homelab/containers/tubearchivist.nix
diff --git a/nix/modules/nixos/features/homelab/default.nix b/nix/modules/nixos/features/homelab/default.nix
index 897465c..56d4b53 100644
--- a/nix/modules/nixos/features/homelab/default.nix
+++ b/nix/modules/nixos/features/homelab/default.nix
@@ -1,15 +1,12 @@
 {
   imports = [
     ./audiobookshelf.nix
-    ./beaverhabits.nix
+    ./containers
     ./forgejo.nix
-    ./freshrss.nix
     ./gitea.nix
     ./immich.nix
     ./jellyfin.nix
     ./paperless.nix
-    ./pi-hole.nix
-    ./tubearchivist-container.nix
     ./vaultwarden.nix
   ];
 }