diff --git a/200-pihole.tf b/200-pihole.tf
deleted file mode 100644
index f7f2006..0000000
--- a/200-pihole.tf
+++ /dev/null
@@ -1,42 +0,0 @@
-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/201-github.tf b/201-github.tf
deleted file mode 100644
index 0302323..0000000
--- a/201-github.tf
+++ /dev/null
@@ -1,44 +0,0 @@
-resource "proxmox_lxc" "ghshr" {
-
-  depends_on = [
-    proxmox_vm_qemu.dev-docker
-  ]
-
-  target_node  = "pve"
-  vmid         = "201"
-  hostname     = "ghshr"
-  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-zfs"
-    size    = "8G"
-  }
-
-  features {
-    fuse    = true
-    nesting = true
-    mount   = "nfs;cifs"
-  }
-
-  network {
-    name   = "eth0"
-    bridge = "vmbr0"
-    ip     = "10.10.10.8/24"
-    gw     = "10.10.10.1"
-    tag    = 10
-  }
-}
diff --git a/201-pihole.tf b/201-pihole.tf
new file mode 100644
index 0000000..141ad60
--- /dev/null
+++ b/201-pihole.tf
@@ -0,0 +1,59 @@
+resource "proxmox_lxc" "pihole" {
+  # depends_on = [
+  #   proxmox_vm_qemu.dev-docker
+  # ]
+  target_node  = "pve"
+  vmid         = "201"
+  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"
+  tags         = "dns;container"
+
+
+
+  ssh_public_keys = <<EOF
+    ${var.ssh_key}
+    EOF
+
+  memory = "4096"
+  swap   = "512"
+
+  rootfs {
+    storage = "local"
+    size    = "8G"
+  }
+
+  // Bind Mount Point
+  mountpoint {
+    key     = "1"
+    slot    = 1
+    storage = "/mnt/lxc/pihole"
+    // Without 'volume' defined, Proxmox will try to create a volume with
+    // the value of 'storage' + : + 'size' (without the trailing G) - e.g.
+    // "/srv/host/bind-mount-point:256".
+    // This behaviour looks to be caused by a bug in the provider.
+    volume = "/mnt/lxc/pihole"
+    mp     = "/data"
+    size   = "1G"
+  }
+
+  features {
+    fuse    = true
+    nesting = true
+    mount   = "nfs;cifs"
+  }
+
+  network {
+    name   = "eth0"
+    bridge = "vmbr0"
+    ip     = "10.10.10.10/24"
+    gw     = "10.10.10.1"
+    tag    = 10
+    ip6    = "auto"
+  }
+}
diff --git a/203-omada.tf b/202-omada.tf
similarity index 79%
rename from 203-omada.tf
rename to 202-omada.tf
index 2198aab..3e62888 100644
--- a/203-omada.tf
+++ b/202-omada.tf
@@ -1,9 +1,9 @@
 resource "proxmox_lxc" "omada" {
-  depends_on = [
-    proxmox_vm_qemu.dev-docker
-  ]
+  # depends_on = [
+  #   proxmox_vm_qemu.dev-docker
+  # ]
   target_node  = "pve"
-  vmid         = "203"
+  vmid         = "202"
   hostname     = "omada"
   ostemplate   = "local:vztmpl/debian-13-standard_13.1-1_amd64.tar.zst"
   password     = var.ci_password
@@ -12,6 +12,7 @@ resource "proxmox_lxc" "omada" {
   onboot       = true
   start        = true
   startup      = "order=1000"
+  tags         = "docker;container;appliance"
 
 
   ssh_public_keys = <<EOF
@@ -22,7 +23,7 @@ resource "proxmox_lxc" "omada" {
   swap   = "512"
 
   rootfs {
-    storage = "local-zfs"
+    storage = "local"
     size    = "8G"
   }
 
@@ -38,5 +39,6 @@ resource "proxmox_lxc" "omada" {
     ip     = "10.10.40.2/24"
     gw     = "10.10.40.1"
     tag    = 40
+    ip6    = "auto"  
   }
 }
diff --git a/400-dev-docker.tf b/400-dev-docker.tf
index a28d8de..3aaf516 100644
--- a/400-dev-docker.tf
+++ b/400-dev-docker.tf
@@ -4,13 +4,14 @@ resource "proxmox_vm_qemu" "dev-docker" {
   target_node = "pve"
   vmid        = "400"
   name        = "dev-docker"
+  tags        = "linux;vm;docker"
 
   # VM Advanced General Settings
   onboot = true
   scsihw = "virtio-scsi-single"
 
   # VM OS Settings
-  clone      = "debian-12-generic-amd64"
+  clone      = "debian-13-generic-amd64"
   clone_wait = 120
   timeouts {
     create = "1h"
@@ -47,7 +48,7 @@ resource "proxmox_vm_qemu" "dev-docker" {
 
   efidisk {
     efitype = "4m"
-    storage = "local-zfs"
+    storage = "local"
   }
 
   disks {
@@ -59,7 +60,7 @@ resource "proxmox_vm_qemu" "dev-docker" {
       }
       ide3 {
         cloudinit {
-          storage = "local-zfs"
+          storage = "local"
         }
       }
     }
@@ -67,7 +68,7 @@ resource "proxmox_vm_qemu" "dev-docker" {
       scsi0 {
         disk {
           size    = 80
-          storage = "local-zfs"
+          storage = "local"
         }
       }
     }
diff --git a/provider.tf b/provider.tf
index 7af8831..272b420 100644
--- a/provider.tf
+++ b/provider.tf
@@ -11,7 +11,9 @@ terraform {
     }
   }
 
-  backend "pg" {}
+  backend "pg" {
+    schema_name = "homelab-infra"
+  }
   encryption {
     key_provider "pbkdf2" "mykey" {
       passphrase    = var.passphrase