diff --git a/centos/7/Dockerfile b/centos/7/Dockerfile
index cd41c08..99c865a 100644
--- a/centos/7/Dockerfile
+++ b/centos/7/Dockerfile
@@ -9,8 +9,8 @@
 
 # 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.8
+RUN yum -y install java-1.7.0-openjdk
+RUN yum -y install gerrit-2.13.11
 
 USER gerrit
 RUN java -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit
diff --git a/ubuntu/16/Dockerfile b/ubuntu/14/Dockerfile
similarity index 89%
rename from ubuntu/16/Dockerfile
rename to ubuntu/14/Dockerfile
index 7edb9c0..87db121 100644
--- a/ubuntu/16/Dockerfile
+++ b/ubuntu/14/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:14.04
 MAINTAINER Gerrit Code Review Community
 
 # Add Gerrit packages repository
@@ -12,8 +12,8 @@
 
 # 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.8-1 && rm -f /var/gerrit/logs/*
+RUN apt-get -y install openjdk-7-jdk
+RUN apt-get -y install gerrit=2.13.11-1 && rm -f /var/gerrit/logs/*
 
 USER gerrit
 RUN java -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit