diff --git a/infra-config/04-vm-templates/README.md b/infra-config/04-vm-templates/README.md
deleted file mode 100644
index 16ad067..0000000
--- a/infra-config/04-vm-templates/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Steps for creating VM templates with Hashicorp Packer
-
-As this is one of the early steps, the assumption is made that these commands will be run on a jumpbox/laptop.
-
-Templates will always live on <template-node> within the cluster.
-
-Steps to install Packer:
-
-```bash
-brew tap hashicorp/tap
-brew install hashicorp/tap/packer
-```
-
-fedora-<version>/
-├── fedora-<version>.pkr.hcl # Main build definition(s)
-├── variables.pkr.hcl        # Variable declarations and default values
-├── <image_name>.pkrvars.hcl # (Optional) Specific variable values for a particular image
-├── files/                   # Files to load on VM
-│   └── ansible.pub         # public key for ansible user
-├── scripts/                 # Directory for shell scripts
-│   ├── cleanup.sh          # Clean up the template
-│   └── setup.yml           # Ansible playbook
-├── httpd/                   # Subdirectory for kickstart configiration
-│   └── ks.cfg              # Source block for Apache image
-└── README.md
-
-# Disable the firewall before starting
-
-```bash
-sudo systemctl stop firewalld
-```
-
-# Create templates
-
-```bash
-packer build -var-file ./fedora-42-small.pkrvars.hcl -var-file ./proxmox.pkvars.hcl -var 'ssh_password=<wed ssh password>' -var 'proxmox_password=<proxmox user password>' .
-packer build -var-file ./fedora-42-medium.pkrvars.hcl -var-file ./proxmox.pkvars.hcl -var 'ssh_password=<wed ssh password>' -var 'proxmox_password=<proxmox user password>' .
-packer build -var-file ./fedora-42-large.pkrvars.hcl -var-file ./proxmox.pkvars.hcl -var 'ssh_password=<wed ssh password>' -var 'proxmox_password=<proxmox user password>' .
-packer build -var-file ./fedora-42-xlarge.pkrvars.hcl -var-file ./proxmox.pkvars.hcl -var 'ssh_password=<wed ssh password>' -var 'proxmox_password=<proxmox user password>' .
-```
diff --git a/infra-config/04-vm-templates/fedora-42/LICENSE b/packer/fedora-42/LICENSE
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/LICENSE
rename to packer/fedora-42/LICENSE
diff --git a/infra-config/04-vm-templates/fedora-42/fedora-42-large-plus.pkrvars.hcl b/packer/fedora-42/fedora-42-large-plus.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/fedora-42-large-plus.pkrvars.hcl
rename to packer/fedora-42/fedora-42-large-plus.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/fedora-42/fedora-42-large.pkrvars.hcl b/packer/fedora-42/fedora-42-large.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/fedora-42-large.pkrvars.hcl
rename to packer/fedora-42/fedora-42-large.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/fedora-42/fedora-42-medium.pkrvars.hcl b/packer/fedora-42/fedora-42-medium.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/fedora-42-medium.pkrvars.hcl
rename to packer/fedora-42/fedora-42-medium.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/fedora-42/fedora-42-small.pkrvars.hcl b/packer/fedora-42/fedora-42-small.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/fedora-42-small.pkrvars.hcl
rename to packer/fedora-42/fedora-42-small.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/fedora-42/fedora-42-xlarge-plus.pkrvars.hcl b/packer/fedora-42/fedora-42-xlarge-plus.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/fedora-42-xlarge-plus.pkrvars.hcl
rename to packer/fedora-42/fedora-42-xlarge-plus.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/fedora-42/fedora-42-xlarge.pkrvars.hcl b/packer/fedora-42/fedora-42-xlarge.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/fedora-42-xlarge.pkrvars.hcl
rename to packer/fedora-42/fedora-42-xlarge.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/fedora-42/fedora-42.pkr.hcl b/packer/fedora-42/fedora-42.pkr.hcl
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/fedora-42.pkr.hcl
rename to packer/fedora-42/fedora-42.pkr.hcl
diff --git a/infra-config/04-vm-templates/fedora-42/files/ansible.pub b/packer/fedora-42/files/ansible.pub
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/files/ansible.pub
rename to packer/fedora-42/files/ansible.pub
diff --git a/infra-config/04-vm-templates/fedora-42/http/ks.cfg b/packer/fedora-42/http/ks.cfg
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/http/ks.cfg
rename to packer/fedora-42/http/ks.cfg
diff --git a/infra-config/04-vm-templates/fedora-42/proxmox.pkvars.hcl b/packer/fedora-42/proxmox.pkvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/proxmox.pkvars.hcl
rename to packer/fedora-42/proxmox.pkvars.hcl
diff --git a/infra-config/04-vm-templates/fedora-42/scripts/cleanup.sh b/packer/fedora-42/scripts/cleanup.sh
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/scripts/cleanup.sh
rename to packer/fedora-42/scripts/cleanup.sh
diff --git a/infra-config/04-vm-templates/fedora-42/scripts/setup.yml b/packer/fedora-42/scripts/setup.yml
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/scripts/setup.yml
rename to packer/fedora-42/scripts/setup.yml
diff --git a/infra-config/04-vm-templates/fedora-42/variables.pkr.hcl b/packer/fedora-42/variables.pkr.hcl
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/variables.pkr.hcl
rename to packer/fedora-42/variables.pkr.hcl
diff --git a/infra-config/04-vm-templates/fedora-42/variables.pkrvars-xlarge.hcl b/packer/fedora-42/variables.pkrvars-xlarge.hcl
similarity index 100%
rename from infra-config/04-vm-templates/fedora-42/variables.pkrvars-xlarge.hcl
rename to packer/fedora-42/variables.pkrvars-xlarge.hcl
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/AGENTS.md b/packer/ubuntu-24.04/AGENTS.md
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/AGENTS.md
rename to packer/ubuntu-24.04/AGENTS.md
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/LICENSE b/packer/ubuntu-24.04/LICENSE
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/LICENSE
rename to packer/ubuntu-24.04/LICENSE
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/files/99-pve.cfg b/packer/ubuntu-24.04/files/99-pve.cfg
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/files/99-pve.cfg
rename to packer/ubuntu-24.04/files/99-pve.cfg
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/files/ansible.pub b/packer/ubuntu-24.04/files/ansible.pub
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/files/ansible.pub
rename to packer/ubuntu-24.04/files/ansible.pub
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/http/ks.cfg b/packer/ubuntu-24.04/http/ks.cfg
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/http/ks.cfg
rename to packer/ubuntu-24.04/http/ks.cfg
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/http/meta-data b/packer/ubuntu-24.04/http/meta-data
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/http/meta-data
rename to packer/ubuntu-24.04/http/meta-data
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/http/user-data b/packer/ubuntu-24.04/http/user-data
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/http/user-data
rename to packer/ubuntu-24.04/http/user-data
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/http/user-data-v2 b/packer/ubuntu-24.04/http/user-data-v2
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/http/user-data-v2
rename to packer/ubuntu-24.04/http/user-data-v2
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/proxmox.pkrvars.hcl b/packer/ubuntu-24.04/proxmox.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/proxmox.pkrvars.hcl
rename to packer/ubuntu-24.04/proxmox.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/scripts/cleanup.sh b/packer/ubuntu-24.04/scripts/cleanup.sh
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/scripts/cleanup.sh
rename to packer/ubuntu-24.04/scripts/cleanup.sh
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/scripts/setup.yml b/packer/ubuntu-24.04/scripts/setup.yml
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/scripts/setup.yml
rename to packer/ubuntu-24.04/scripts/setup.yml
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/ubuntu-24.04.pkr.hcl b/packer/ubuntu-24.04/ubuntu-24.04.pkr.hcl
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/ubuntu-24.04.pkr.hcl
rename to packer/ubuntu-24.04/ubuntu-24.04.pkr.hcl
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/ubuntu-24.04.pkrvars.hcl b/packer/ubuntu-24.04/ubuntu-24.04.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/ubuntu-24.04.pkrvars.hcl
rename to packer/ubuntu-24.04/ubuntu-24.04.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/variables.pkr.hcl b/packer/ubuntu-24.04/variables.pkr.hcl
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/variables.pkr.hcl
rename to packer/ubuntu-24.04/variables.pkr.hcl
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/vm-large-plus.pkrvars.hcl b/packer/ubuntu-24.04/vm-large-plus.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/vm-large-plus.pkrvars.hcl
rename to packer/ubuntu-24.04/vm-large-plus.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/vm-large.pkrvars.hcl b/packer/ubuntu-24.04/vm-large.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/vm-large.pkrvars.hcl
rename to packer/ubuntu-24.04/vm-large.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/vm-medium.pkrvars.hcl b/packer/ubuntu-24.04/vm-medium.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/vm-medium.pkrvars.hcl
rename to packer/ubuntu-24.04/vm-medium.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/vm-small.pkrvars.hcl b/packer/ubuntu-24.04/vm-small.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/vm-small.pkrvars.hcl
rename to packer/ubuntu-24.04/vm-small.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/vm-xlarge-plus.pkrvars.hcl b/packer/ubuntu-24.04/vm-xlarge-plus.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/vm-xlarge-plus.pkrvars.hcl
rename to packer/ubuntu-24.04/vm-xlarge-plus.pkrvars.hcl
diff --git a/infra-config/04-vm-templates/ubuntu-24.04.03/vm-xlarge.pkrvars.hcl b/packer/ubuntu-24.04/vm-xlarge.pkrvars.hcl
similarity index 100%
rename from infra-config/04-vm-templates/ubuntu-24.04.03/vm-xlarge.pkrvars.hcl
rename to packer/ubuntu-24.04/vm-xlarge.pkrvars.hcl