diff --git a/vagrant/puppet5/Vagrantfile b/vagrant/puppet5/Vagrantfile
new file mode 100644
index 0000000000000000000000000000000000000000..83dbf8ad9ab99d72b9db377bd6196308219c8c49
--- /dev/null
+++ b/vagrant/puppet5/Vagrantfile
@@ -0,0 +1,16 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+IMAGE = 'matefarkas/xenial:puppet5'
+
+Vagrant.configure(2) do |config|
+  config.vm.hostname = Dir.pwd.split('/')[-1]
+  config.vm.provider "docker" do |docker|
+    docker.image = IMAGE
+    docker.has_ssh = true
+  end
+  config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
+  config.ssh.forward_agent = true
+  config.vm.provision "shell", path: "provision.sh"
+end
+
diff --git a/vagrant/puppet5/provision.sh b/vagrant/puppet5/provision.sh
new file mode 100644
index 0000000000000000000000000000000000000000..ad1f0377616a95191cc0a57a91dc3789e93fa422
--- /dev/null
+++ b/vagrant/puppet5/provision.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Change git user settings
+sed -i -e 's/name = Vagrant.*$/name = Mate Farkas/' -e 's/email = vagrant@puppet5.*$/email = mate.farkas@sch.hu/' /home/vagrant/.gitconfig
+
+# Change git origin URL
+sed -i 's/url = https:\/\/github.com\/farkasmate\/control-repo.git.*$/url = git@github.com:farkasmate\/control-repo.git/' /home/vagrant/git/.git/config
+