diff --git a/centos/7/Dockerfile b/centos/7/Dockerfile
new file mode 100644
index 0000000..56cbd33
--- /dev/null
+++ b/centos/7/Dockerfile
@@ -0,0 +1,25 @@
+FROM centos:7.3.1611
+MAINTAINER Gerrit Code Review Community
+
+# Allow remote connectivity and sudo
+RUN yum -y install openssh-client initscripts sudo
+
+# Add Gerrit packages repository
+RUN rpm -i https://gerritforge.com/gerritforge-repo-1-2.noarch.rpm
+
+# Install OpenJDK and Gerrit in two subsequent transactions
+# (pre-trans Gerrit script needs to have access to the Java command)
+RUN yum -y install java-1.8.0-openjdk
+RUN yum -y install gerrit-2.14.3-1
+
+USER gerrit
+RUN java -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit
+RUN java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
+
+# Allow incoming traffic
+EXPOSE 29418 8080
+
+VOLUME ["/var/gerrit/git", "/var/gerrit/index", "/var/gerrit/cache", "/var/gerrit/db", "/var/gerrit/etc"]
+
+# Start Gerrit
+CMD /var/gerrit/bin/gerrit.sh start && tail -f /var/gerrit/logs/error_log
diff --git a/ubuntu/16/Dockerfile b/ubuntu/16/Dockerfile
new file mode 100644
index 0000000..e10bda3
--- /dev/null
+++ b/ubuntu/16/Dockerfile
@@ -0,0 +1,27 @@
+FROM ubuntu:16.04
+MAINTAINER Gerrit Code Review Community
+
+# Add Gerrit packages repository
+RUN echo "deb mirror://mirrorlist.gerritforge.com/deb gerrit contrib" > /etc/apt/sources.list.d/GerritForge.list
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1871F775
+
+# Allow remote connectivity and sudo
+RUN apt-get update
+RUN apt-key update
+RUN apt-get -y install openssh-client sudo
+
+# Install OpenJDK and Gerrit in two subsequent transactions
+# (pre-trans Gerrit script needs to have access to the Java command)
+RUN apt-get -y install openjdk-8-jdk
+RUN apt-get -y install gerrit=2.14.3-1 && rm -f /var/gerrit/logs/*
+
+USER gerrit
+RUN java -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit
+
+# Allow incoming traffic
+EXPOSE 29418 8080
+
+VOLUME ["/var/gerrit/git", "/var/gerrit/index", "/var/gerrit/cache", "/var/gerrit/db", "/var/gerrit/etc"]
+
+# Start Gerrit
+CMD /var/gerrit/bin/gerrit.sh start && tail -f /var/gerrit/logs/error_log