diff --git a/modules/openstack_project/files/sources.list.precise.amd64 b/modules/openstack_project/files/sources.list.precise.amd64
deleted file mode 100644
index 1d94ffa450..0000000000
--- a/modules/openstack_project/files/sources.list.precise.amd64
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is kept updated by puppet, adapted from
-# https://help.ubuntu.com/12.04/sample/sources.list
-
-deb http://us.archive.ubuntu.com/ubuntu precise main restricted
-deb http://us.archive.ubuntu.com/ubuntu precise-updates main restricted
-deb http://us.archive.ubuntu.com/ubuntu precise universe
-deb http://us.archive.ubuntu.com/ubuntu precise-updates universe
-deb http://us.archive.ubuntu.com/ubuntu precise multiverse
-deb http://us.archive.ubuntu.com/ubuntu precise-updates multiverse
-deb http://us.archive.ubuntu.com/ubuntu precise-backports main restricted universe multiverse
-deb http://security.ubuntu.com/ubuntu precise-security main restricted
-deb http://security.ubuntu.com/ubuntu precise-security universe
-deb http://security.ubuntu.com/ubuntu precise-security multiverse
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 2cc8921efd..631819a71b 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -82,18 +82,12 @@ class openstack_project::review (
   $projects_config = 'openstack_project/review.projects.ini.erb',
 ) {
 
-  $java_home = $::lsbdistcodename ? {
-    'precise' => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
-    'trusty'  => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
-  }
-
   class { 'project_config':
     url  => $project_config_repo,
   }
 
   $accountpatchreviewdb_url = "jdbc:mysql://${mysql_host}:3306/accountPatchReviewDb?characterSetResults=utf8&characterEncoding=utf8&connectionCollation=utf8_bin&useUnicode=yes&user=gerrit2&password=${mysql_password}"
   class { 'openstack_project::gerrit':
-    java_home                           => $java_home,
     git_http_url                        => 'https://git.openstack.org/',
     canonical_git_url                   => 'git://git.openstack.org/',
     ssl_cert_file                       => $ssl_cert_file,
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index 125231fe06..05d2da3f5c 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -28,9 +28,18 @@ class openstack_project::review_dev (
   $projects_config = 'openstack_project/review-dev.projects.ini.erb',
 ) {
 
-  $java_home = $::lsbdistcodename ? {
-    'precise' => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
-    'trusty'  => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
+  case $::lsbdistcodename {
+    'trusty': {
+      $jre_package = 'openjdk-7-jre-headless'
+      $java_home = '/usr/lib/jvm/java-7-openjdk-amd64/jre'
+    }
+    'xenial': {
+      $jre_package = 'openjdk-8-jre-headless'
+      $java_home = '/usr/lib/jvm/java-8-openjdk-amd64/jre'
+    }
+    default: {
+      fail("Operating system release ${::lsbdistcodename} not supported.")
+    }
   }
 
   realize (
@@ -202,7 +211,7 @@ class openstack_project::review_dev (
     unless      => "keytool -list -alias storyboard-dev.openstack.org -storepass changeit -keystore $java_home/lib/security/cacerts  >/dev/null 2>&1",
     path        => '/bin:/usr/bin',
     require     => [
-      Package['openjdk-7-jre-headless'],
+      Package[$jre_package],
       File['/home/gerrit2/storyboard-dev.crt'],
     ],
   }
diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp
index a148beac1d..479e4959cb 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -26,14 +26,6 @@ class openstack_project::status (
 
   include ::httpd
 
-  # The Apache mod_version module only needs to be enabled on Ubuntu 12.04
-  # as it comes compiled and enabled by default on newer OS, including CentOS
-  if !defined(Httpd::Mod['version']) and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '12.04' {
-    httpd::mod { 'version':
-      ensure => present
-    }
-  }
-
   if ! defined(Httpd::Mod['rewrite']) {
     httpd::mod { 'rewrite':
         ensure => present,