diff --git a/docker/amazonlinux/puppet5/Dockerfile b/docker/amazonlinux/puppet5/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..56acec973e1f4a38acedeb6330ace21fe1fbbaf3
--- /dev/null
+++ b/docker/amazonlinux/puppet5/Dockerfile
@@ -0,0 +1,34 @@
+FROM matefarkas/amazonlinux:base
+MAINTAINER Mate Farkas <mate.farkas@sch.hu>
+
+RUN rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm
+RUN rpm -Uvh https://yum.puppetlabs.com/puppet5/puppet-release-el-6.noarch.rpm
+
+RUN yum install --assumeyes \
+  bash-completion \
+  git \
+  man \
+  puppet-agent \
+  tig
+
+RUN /opt/puppetlabs/puppet/bin/gem install r10k
+RUN ln -s /opt/puppetlabs/puppet/bin/wrapper.sh /opt/puppetlabs/bin/r10k
+
+RUN git clone https://github.com/puppetlabs/puppet-syntax-vim.git /home/vagrant/.vim
+
+RUN echo 'export EDITOR=vim' >> /home/vagrant/.bashrc
+
+RUN rm -rf /etc/puppetlabs/code
+RUN git clone https://github.com/farkasmate/control-repo.git /etc/puppetlabs/code
+RUN ln -s /etc/puppetlabs/code /home/vagrant/git
+RUN ln -s ../../hooks/post-commit /home/vagrant/git/.git/hooks/post-commit
+
+ADD etc/puppetlabs/r10k/r10k.yaml /etc/puppetlabs/r10k/r10k.yaml
+ADD home/vagrant/.gitconfig /home/vagrant/.gitconfig
+
+RUN chown -R vagrant:vagrant /home/vagrant/
+RUN chown -R vagrant:vagrant /etc/puppetlabs/code
+
+EXPOSE 22
+CMD /sbin/mini-init
+
diff --git a/docker/amazonlinux/puppet5/Makefile b/docker/amazonlinux/puppet5/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..5f795177e165f179a0549693c79a0cba5526a462
--- /dev/null
+++ b/docker/amazonlinux/puppet5/Makefile
@@ -0,0 +1,8 @@
+TAG='matefarkas/amazonlinux:puppet5'
+
+all:
+	docker build --tag ${TAG} ${PWD}
+
+test:
+	docker run --interactive --tty --rm ${TAG} bash || true
+
diff --git a/docker/amazonlinux/puppet5/README.md b/docker/amazonlinux/puppet5/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..99f57374d11e8303ed2a6bf9b086cdb039838e85
--- /dev/null
+++ b/docker/amazonlinux/puppet5/README.md
@@ -0,0 +1,4 @@
+# matefarkas/amazonlinux:puppet5
+
+AmazonLinux based Puppet 5 image.
+
diff --git a/docker/amazonlinux/puppet5/etc/puppetlabs/r10k/r10k.yaml b/docker/amazonlinux/puppet5/etc/puppetlabs/r10k/r10k.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8b9f181803fb0f2ba78676f7abb27138ba16d94d
--- /dev/null
+++ b/docker/amazonlinux/puppet5/etc/puppetlabs/r10k/r10k.yaml
@@ -0,0 +1,5 @@
+:sources:
+  :local:
+    remote: 'file:///etc/puppetlabs/code/'
+    basedir: '/etc/puppetlabs/code/environments'
+
diff --git a/docker/amazonlinux/puppet5/home/vagrant/.gitconfig b/docker/amazonlinux/puppet5/home/vagrant/.gitconfig
new file mode 100644
index 0000000000000000000000000000000000000000..606b99442c0861eddceef237d7bae7c2e05109dc
--- /dev/null
+++ b/docker/amazonlinux/puppet5/home/vagrant/.gitconfig
@@ -0,0 +1,6 @@
+[user]
+	name = Vagrant
+	email = vagrant@puppet5
+[help]
+	autocorrect = -1
+