diff --git a/install_puppet.sh b/install_puppet.sh
index a50b882f96..9b4297c225 100755
--- a/install_puppet.sh
+++ b/install_puppet.sh
@@ -187,10 +187,14 @@ Pin: version $FACTER_VERSION
 Pin-Priority: 501
 EOF
 
-    puppet_deb=puppetlabs-release-${lsbdistcodename}.deb
-    wget http://apt.puppetlabs.com/$puppet_deb -O $puppet_deb
-    dpkg -i $puppet_deb
-    rm $puppet_deb
+    # NOTE(pabelanger): Puppetlabs does not support ubuntu xenial. Instead use
+    # the version of puppet ship by xenial.
+    if [ $lsbdistcodename != 'xenial']; then
+        puppet_deb=puppetlabs-release-${lsbdistcodename}.deb
+        wget http://apt.puppetlabs.com/$puppet_deb -O $puppet_deb
+        dpkg -i $puppet_deb
+        rm $puppet_deb
+    fi;
 
     apt-get update
     DEBIAN_FRONTEND=noninteractive apt-get --option 'Dpkg::Options::=--force-confold' \
diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp
index 43a88f4a20..635abae753 100644
--- a/modules/openstack_project/manifests/jenkins_params.pp
+++ b/modules/openstack_project/manifests/jenkins_params.pp
@@ -126,7 +126,11 @@ class openstack_project::jenkins_params {
       $libxml2_dev_package = 'libxml2-dev'
       $libxslt_dev_package = 'libxslt1-dev'
       $libffi_dev_package = 'libffi-dev'
-      $maven_package = 'maven2'
+      if ($::operatingsystem == 'Ubuntu') and ($::operatingsystemrelease >= '16.04') {
+        $maven_package = 'maven'
+      } else {
+        $maven_package = 'maven2'
+      }
       # For tooz unit tests
       $memcached_package = 'memcached'
       # For tooz unit tests (and others that use redis)
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 4fbe340bcf..87e0a9357a 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -321,9 +321,9 @@ class openstack_project::template (
   # Which Puppet do I take?
   # Take $puppet_version and pin to that version
   if ($::osfamily == 'Debian') {
-    # Note(JR): Puppetlabs does not support Ubuntu Vivid currently, but it
-    # also seems that distro packages are recent enough
-    if ($::operatingsystemrelease != '15.04') {
+    # NOTE(pabelanger): Puppetlabs only support Ubuntu Trusty and below,
+    # anything greater will use the OS version of puppet.
+    if ($::operatingsystemrelease < '15.04') {
       apt::source { 'puppetlabs':
         location => 'http://apt.puppetlabs.com',
         repos    => 'main',