diff --git a/.gitignore b/.gitignore
index 1d249ea28f..c223606b34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 /.tags
 /.idea
 /.trash-cache
-/.vagrant
+.vagrant/
 /.kube
 /.cache
 /.docker
diff --git a/tests/e2e/createcluster/Vagrantfile b/tests/e2e/createcluster/Vagrantfile
new file mode 100644
index 0000000000..4842a8658e
--- /dev/null
+++ b/tests/e2e/createcluster/Vagrantfile
@@ -0,0 +1,75 @@
+NODE_ROLES = (ENV['NODE_ROLES'] ||
+  ["server-0", "server-1", "server-2", "agent-0", "agent-1"])
+NODE_BOXES = (ENV['NODE_BOXES'] ||
+  ['generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004', 'generic/ubuntu2004'])
+GITHUB_BRANCH = (ENV['GITHUB_BRANCH'] || "master")
+NODE_CPUS = (ENV['NODE_CPUS'] || 2).to_i
+NODE_MEMORY = (ENV['NODE_MEMORY'] || 2048).to_i
+# Virtualbox >= 6.1.28 require `/etc/vbox/network.conf` for expanded private networks 
+NETWORK_PREFIX = "10.10.10"
+
+def provision(vm, roles, role_num, node_num)
+  vm.box = NODE_BOXES[node_num]
+  vm.hostname = "#{roles[0]}-#{role_num}"
+  # An expanded netmask is required to allow VM<-->VM communication, virtualbox defaults to /32
+  vm.network "private_network", ip: "#{NETWORK_PREFIX}.#{100+node_num}", netmask: "255.255.255.0"
+
+  osConfigure(vm)
+  vm.provision "shell",
+    inline: "curl -s -H 'Accept: application/vnd.github.v3.sha' 'https://api.github.com/repos/k3s-io/k3s/commits/#{GITHUB_BRANCH}' &> /tmp/k3s_commit"
+
+  vm.provision "shell", inline: "ping -c 2 k3s.io"
+  
+  if roles.include?("server") && role_num == 0
+    vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s|
+      k3s.installer_url = 'https://get.k3s.io'
+      k3s.args = %W[server --cluster-init --node-external-ip=#{NETWORK_PREFIX}.100 --flannel-iface=eth1]
+      k3s.env = %W[K3S_KUBECONFIG_MODE=0644 K3S_TOKEN=vagrant INSTALL_K3S_COMMIT=$(cat\ /tmp/k3s_commit)]
+      k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
+    end
+  elsif roles.include?("server") && role_num != 0
+    vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s|
+      k3s.installer_url = 'https://get.k3s.io'
+      k3s.args = %W[server --server https://10.10.10.100:6443 --flannel-iface=eth1]
+      k3s.env = %W[K3S_KUBECONFIG_MODE=0644 K3S_TOKEN=vagrant INSTALL_K3S_COMMIT=$(cat\ /tmp/k3s_commit)]
+      k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
+    end
+  end
+  if roles.include?("agent")
+    vm.provision 'k3s-install', type: 'k3s', run: 'once' do |k3s|
+      k3s.installer_url = 'https://get.k3s.io'
+      k3s.args = %w[agent --server https://10.10.10.100:6443 --flannel-iface=eth1]
+      k3s.env = %W[K3S_KUBECONFIG_MODE=0644 K3S_TOKEN=vagrant INSTALL_K3S_COMMIT=$(cat\ /tmp/k3s_commit)]
+      k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
+    end
+  end
+ 
+end
+
+def osConfigure(vm)
+
+  if vm.box.include?("ubuntu2004")
+    vm.provision "shell", inline: "systemd-resolve --set-dns=8.8.8.8 --interface=eth0"
+  end
+
+end
+
+Vagrant.configure("2") do |config|
+  config.vagrant.plugins = ["vagrant-k3s"]
+  config.vm.provider "virtualbox" do |v|
+    v.cpus = NODE_CPUS
+    v.memory = NODE_MEMORY
+  end
+  
+  # Must iterate on the index, vagrant does not understand iterating 
+  # over the node roles themselves
+  NODE_ROLES.length.times do |i|
+    name = NODE_ROLES[i]
+    config.vm.define name do |node|
+      roles = name.split("-", -1)
+      role_num = roles.pop.to_i
+      provision(node.vm, roles, role_num, i)
+    end
+  end
+
+end