diff --git a/modules/openstack_project/manifests/params.pp b/modules/openstack_project/manifests/params.pp
index bbcad2a784..ee5113b3fa 100644
--- a/modules/openstack_project/manifests/params.pp
+++ b/modules/openstack_project/manifests/params.pp
@@ -12,7 +12,14 @@ class openstack_project::params {
     }
     'Debian': {
       $packages = ['puppet', 'wget']
-      $user_packages = ['byobu', 'emacs23-nox', 'vim-nox']
+      case $::operatingsystemrelease {
+        '15.04': {
+          $user_packages = ['byobu', 'emacs24-nox', 'vim-nox']
+        }
+        default: {
+          $user_packages = ['byobu', 'emacs23-nox', 'vim-nox']
+        }
+      }
       $update_pkg_list_cmd = 'apt-get update >/dev/null 2>&1;'
       $login_defs = 'puppet:///modules/openstack_project/login.defs.debian'
     }
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 4f30c7466c..0a63a358c8 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -292,11 +292,15 @@ class openstack_project::template (
   # Which Puppet do I take?
   # Take $puppet_version and pin to that version
   if ($::osfamily == 'Debian') {
-    apt::source { 'puppetlabs':
-      location   => 'http://apt.puppetlabs.com',
-      repos      => 'main',
-      key        => '4BD6EC30',
-      key_server => 'pgp.mit.edu',
+    # Note(JR): Puppetlabs does not support Ubuntu Vivid currently, but it
+    # also seems that distro packages are recent enough
+    if ($::operatingsystemrelease != '15.04') {
+      apt::source { 'puppetlabs':
+        location   => 'http://apt.puppetlabs.com',
+        repos      => 'main',
+        key        => '4BD6EC30',
+        key_server => 'pgp.mit.edu',
+      }
     }
 
     file { '/etc/apt/apt.conf.d/80retry':