diff --git a/config/components.yml b/config/components.yml
index db5a732ae7..be87e28f30 100644
--- a/config/components.yml
+++ b/config/components.yml
@@ -29,7 +29,7 @@ containers:
 # Please see the documentation for more detail.
 jres:
   - "JavaBuildpack::Jre::OpenJdkJRE"
-# - "JavaBuildpack::Jre::OracleJRE"
+#  - "JavaBuildpack::Jre::OracleJRE"
 
 frameworks:
   - "JavaBuildpack::Framework::AppDynamicsAgent"
diff --git a/config/open_jdk_jre.yml b/config/open_jdk_jre.yml
index 2a4feb2af6..b99fee2b2f 100644
--- a/config/open_jdk_jre.yml
+++ b/config/open_jdk_jre.yml
@@ -17,13 +17,13 @@
 # To go back to Java 7, permgen should be used instead of metaspace.  Please see the documentation for more detail.
 ---
 repository_root: "{default.repository.root}/openjdk/{platform}/{architecture}"
-version: 1.8.0_+
+version: 1.7.0_+
 memory_sizes:
-  metaspace: 64m..
-  # permgen: 64m..
+#  metaspace: 512m..
+  permgen: 512m..
 memory_heuristics:
   heap: 75
-  metaspace: 10
-  # permgen: 10
+#  metaspace: 10
+  permgen: 10
   stack: 5
   native: 10
diff --git a/config/oracle_jre.yml b/config/oracle_jre.yml
index cdb6226dc2..41dd916afc 100644
--- a/config/oracle_jre.yml
+++ b/config/oracle_jre.yml
@@ -20,10 +20,10 @@
 # e.g.  repository_root: "http://example.com/oracle-jre/{platform}/{architecture}"
 
 repository_root: ""
-version: 1.8.0_+
+version: 1.7.0_+
 memory_sizes:
-  metaspace: 64m..
-#  permgen: 64m..
+  metaspace: 512m..
+  permgen: 512m..
 memory_heuristics:
   heap: 75
   metaspace: 10
diff --git a/config/tomcat.yml b/config/tomcat.yml
index 3f70597af7..fcec7b27c5 100644
--- a/config/tomcat.yml
+++ b/config/tomcat.yml
@@ -16,7 +16,7 @@
 # Configuration for the Tomcat container
 ---
 tomcat:
-  version: 8.0.+
+  version: 7.0.+
   repository_root: "{default.repository.root}/tomcat"
 lifecycle_support:
   version: 2.+