diff --git a/200-pihole.tf b/200-pihole.tf
new file mode 100644
index 0000000..f7f2006
--- /dev/null
+++ b/200-pihole.tf
@@ -0,0 +1,42 @@
+resource "proxmox_lxc" "pihole" {
+  depends_on = [
+    proxmox_vm_qemu.dev-docker
+  ]
+  target_node  = "pve-dev"
+  vmid         = "200"
+  hostname     = "pihole"
+  ostemplate   = "local:vztmpl/debian-13-standard_13.1-1_amd64.tar.zst"
+  password     = var.ci_password
+  unprivileged = false
+  ostype       = "debian"
+  onboot       = true
+  start        = true
+  startup      = "order=1000"
+
+
+  ssh_public_keys = <<EOF
+    ${var.ssh_key}
+    EOF
+
+  memory = "4096"
+  swap   = "512"
+
+  rootfs {
+    storage = "local"
+    size    = "8G"
+  }
+
+  features {
+    fuse    = true
+    nesting = true
+    mount   = "nfs;cifs"
+  }
+
+  network {
+    name   = "eth0"
+    bridge = "vmbr0"
+    ip     = "10.10.40.2/24"
+    gw     = "10.10.40.1"
+    tag    = 40
+  }
+}
diff --git a/github.tf b/201-github.tf
similarity index 88%
rename from github.tf
rename to 201-github.tf
index 2fbb7f2..0302323 100644
--- a/github.tf
+++ b/201-github.tf
@@ -7,7 +7,7 @@ resource "proxmox_lxc" "ghshr" {
   target_node  = "pve"
   vmid         = "201"
   hostname     = "ghshr"
-  ostemplate   = "local:vztmpl/debian-12-standard_12.7-1_amd64.tar.zst"
+  ostemplate   = "local:vztmpl/debian-13-standard_13.1-1_amd64.tar.zst"
   password     = var.ci_password
   unprivileged = false
   ostype       = "debian"
@@ -24,7 +24,7 @@ resource "proxmox_lxc" "ghshr" {
   swap   = "512"
 
   rootfs {
-    storage = "local"
+    storage = "local-zfs"
     size    = "8G"
   }
 
diff --git a/omada.tf b/203-omada.tf
similarity index 84%
rename from omada.tf
rename to 203-omada.tf
index 5e8208d..2198aab 100644
--- a/omada.tf
+++ b/203-omada.tf
@@ -3,9 +3,9 @@ resource "proxmox_lxc" "omada" {
     proxmox_vm_qemu.dev-docker
   ]
   target_node  = "pve"
-  vmid         = "200"
+  vmid         = "203"
   hostname     = "omada"
-  ostemplate   = "local:vztmpl/debian-12-standard_12.7-1_amd64.tar.zst"
+  ostemplate   = "local:vztmpl/debian-13-standard_13.1-1_amd64.tar.zst"
   password     = var.ci_password
   unprivileged = false
   ostype       = "debian"
@@ -22,7 +22,7 @@ resource "proxmox_lxc" "omada" {
   swap   = "512"
 
   rootfs {
-    storage = "local"
+    storage = "local-zfs"
     size    = "8G"
   }
 
diff --git a/dev-docker.tf b/400-dev-docker.tf
similarity index 93%
rename from dev-docker.tf
rename to 400-dev-docker.tf
index 7662c25..a28d8de 100644
--- a/dev-docker.tf
+++ b/400-dev-docker.tf
@@ -47,7 +47,7 @@ resource "proxmox_vm_qemu" "dev-docker" {
 
   efidisk {
     efitype = "4m"
-    storage = "local"
+    storage = "local-zfs"
   }
 
   disks {
@@ -59,7 +59,7 @@ resource "proxmox_vm_qemu" "dev-docker" {
       }
       ide3 {
         cloudinit {
-          storage = "local"
+          storage = "local-zfs"
         }
       }
     }
@@ -67,7 +67,7 @@ resource "proxmox_vm_qemu" "dev-docker" {
       scsi0 {
         disk {
           size    = 80
-          storage = "local"
+          storage = "local-zfs"
         }
       }
     }