diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..a3670af
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,64 @@
+Vagrant.configure("2") do |config|
+  config.vm.boot_timeout = 600
+
+  config.vm.provider "libvirt" do |lv|
+    lv.memory = "2048"
+    lv.cpus = 1
+  end
+
+  config.vm.define "talos" do |debian|
+    debian.vm.box = "debian/bookworm64"
+    debian.vm.hostname = "test-talos"
+    debian.vm.network "private_network", type: "dhcp"
+    debian.vm.network "forwarded_port", guest: 22, host: 3022
+  end
+  config.vm.define "nocturnal" do |debian|
+    debian.vm.box = "debian/bookworm64"
+    debian.vm.hostname = "test-nocturnal"
+    debian.vm.network "private_network", ip: "192.168.121.100"  # Static IP needed for nas
+    debian.vm.network "forwarded_port", guest: 22, host: 3023
+  end
+  config.vm.define "vaermina" do |debian|
+    debian.vm.box = "debian/bookworm64"
+    debian.vm.hostname = "test-vaermina"
+    debian.vm.network "private_network", type: "dhcp"
+    debian.vm.network "forwarded_port", guest: 22, host: 3024
+  end
+
+  config.vm.define "meridia" do |arch|
+    arch.vm.box = "generic/arch"
+    arch.vm.hostname = "test-meridia"
+    arch.vm.network "private_network", type: "dhcp"
+    arch.vm.network "forwarded_port", guest: 22, host: 3025
+    arch.vm.provision "shell", inline: <<-SHELL
+      pacman -Sy --noconfirm python
+    SHELL
+  end
+  config.vm.define "dibella" do |arch|
+    arch.vm.box = "generic/arch"
+    arch.vm.hostname = "test-dibella"
+    arch.vm.network "private_network", type: "dhcp"
+    arch.vm.network "forwarded_port", guest: 22, host: 3026
+    arch.vm.provision "shell", inline: <<-SHELL
+      pacman -Sy --noconfirm python
+    SHELL
+  end
+  config.vm.define "azura" do |arch|
+    arch.vm.box = "generic/arch"
+    arch.vm.hostname = "test-azura"
+    arch.vm.network "private_network", type: "dhcp"
+    arch.vm.network "forwarded_port", guest: 22, host: 3027
+    arch.vm.provision "shell", inline: <<-SHELL
+      pacman -Sy --noconfirm python
+    SHELL
+  end
+  config.vm.define "kynareth" do |arch|
+    arch.vm.box = "generic/arch"
+    arch.vm.hostname = "test-kynareth"
+    arch.vm.network "private_network", type: "dhcp"
+    arch.vm.network "forwarded_port", guest: 22, host: 3028
+    arch.vm.provision "shell", inline: <<-SHELL
+      pacman -Sy --noconfirm python
+    SHELL
+  end
+end
diff --git a/inventory.test.yml b/inventory.test.yml
new file mode 100644
index 0000000..64175c7
--- /dev/null
+++ b/inventory.test.yml
@@ -0,0 +1,63 @@
+rpi:
+  hosts:
+    vaermina:
+      ansible_host: 127.0.0.1
+      ansible_port: 3024
+      ansible_user: vagrant
+      ansible_ssh_private_key_file: .vagrant/machines/vaermina/virtualbox/private_key
+    azura:
+      ansible_host: 127.0.0.1
+      ansible_port: 3027
+      ansible_user: vagrant
+      ansible_ssh_private_key_file: .vagrant/machines/azura/virtualbox/private_key
+    kynareth:
+      ansible_host: 127.0.0.1
+      ansible_port: 3028
+      ansible_user: vagrant
+      ansible_ssh_private_key_file: .vagrant/machines/kynareth/virtualbox/private_key
+    nocturnal:
+      ansible_host: 127.0.0.1
+      ansible_port: 3023
+      ansible_user: vagrant
+      ansible_ssh_private_key_file: .vagrant/machines/nocturnal/virtualbox/private_key
+      internal_ip: "192.168.121.100" # Static IP corresponding to Vagrantfile
+x86:
+  hosts:
+    talos:
+      ansible_host: 127.0.0.1
+      ansible_port: 3022
+      ansible_user: vagrant
+      ansible_ssh_private_key_file: .vagrant/machines/talos/virtualbox/private_key
+    meridia:
+      ansible_host: 127.0.0.1
+      ansible_port: 3025
+      ansible_user: vagrant
+      ansible_ssh_private_key_file: .vagrant/machines/meridia/virtualbox/private_key
+    dibella:
+      ansible_host: 127.0.0.1
+      ansible_port: 3026
+      ansible_user: vagrant
+      ansible_ssh_private_key_file: .vagrant/machines/dibella/virtualbox/private_key
+
+debian:
+  hosts:
+    vaermina:
+    talos:
+    nocturnal:
+arch:
+  hosts:
+    azura:
+    kynareth:
+    meridia:
+    dibella:
+home:
+  hosts:
+    azura:
+    vaermina:
+    kynareth:
+    nocturnal:
+    talos:
+cloud:
+  hosts:
+    meridia:
+    dibella:
diff --git a/inventory.yml b/inventory.yml
index 5552eb0..5f287d7 100644
--- a/inventory.yml
+++ b/inventory.yml
@@ -16,16 +16,11 @@ x86:
       ansible_host: 62.171.176.43
     dibella:
       ansible_host: 45.88.188.77
-    todd-test:
 debian:
   hosts:
     vaermina:
     talos:
     nocturnal:
-    todd-test:
-      # Local test VM
-      ansible_port: 3022
-      ansible_host: 127.0.0.1
 arch:
   hosts:
     azura:
@@ -39,9 +34,6 @@ home:
     kynareth:
     nocturnal:
     talos:
-virtual:
-  hosts:
-    todd-test:
 cloud:
   hosts:
     meridia: