diff --git a/6/Dockerfile b/6/Dockerfile
new file mode 100644
index 00000000..906d5b32
--- /dev/null
+++ b/6/Dockerfile
@@ -0,0 +1,11 @@
+FROM debian:wheezy
+
+# A few problems with compiling Java from source:
+#  1. Oracle.  Licensing prevents us from redistributing the official JDK.
+#  2. Compiling OpenJDK also requires the JDK to be installed, and it gets
+#       really hairy.
+
+RUN apt-get update && apt-get install -y curl openjdk-6-jdk=6b32* wget
+
+# If you're reading this and have any feedback on how this image could be
+#   improved, please open an issue or a pull request so we can discuss it!
diff --git a/Dockerfile b/7/Dockerfile
similarity index 84%
rename from Dockerfile
rename to 7/Dockerfile
index d33f37fe..27d674db 100644
--- a/Dockerfile
+++ b/7/Dockerfile
@@ -5,7 +5,7 @@ FROM debian:jessie
 #  2. Compiling OpenJDK also requires the JDK to be installed, and it gets
 #       really hairy.
 
-RUN apt-get update && apt-get install -y openjdk-7-jdk
+RUN apt-get update && apt-get install -y curl openjdk-7-jdk=7u60* wget
 
 # If you're reading this and have any feedback on how this image could be
 #   improved, please open an issue or a pull request so we can discuss it!
diff --git a/8/Dockerfile b/8/Dockerfile
new file mode 100644
index 00000000..ebcf47f9
--- /dev/null
+++ b/8/Dockerfile
@@ -0,0 +1,11 @@
+FROM debian:experimental
+
+# A few problems with compiling Java from source:
+#  1. Oracle.  Licensing prevents us from redistributing the official JDK.
+#  2. Compiling OpenJDK also requires the JDK to be installed, and it gets
+#       really hairy.
+
+RUN apt-get update && apt-get install -y curl openjdk-8-jdk=8u20* wget
+
+# If you're reading this and have any feedback on how this image could be
+#   improved, please open an issue or a pull request so we can discuss it!