diff --git a/modules.env b/modules.env
index d9e1a476aa..13731def44 100644
--- a/modules.env
+++ b/modules.env
@@ -46,7 +46,7 @@ SOURCE_MODULES["https://github.com/nanliu/puppet-staging"]="1.0.0"
 SOURCE_MODULES["https://github.com/puppet-community/puppet-alternatives"]="0.3.0"
 SOURCE_MODULES["https://github.com/puppet-community/puppet-archive"]="0.3.0"
 SOURCE_MODULES["https://github.com/puppet-community/puppet-module-puppetboard"]="2.4.0"
-SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-apt"]="1.4.2"
+SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-apt"]="2.1.0"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-concat"]="1.1.0"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-firewall"]="1.1.3"
 SOURCE_MODULES["https://github.com/puppetlabs/puppetlabs-haproxy"]="0.4.1"
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index f50b2dd601..0a4732a5d3 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -304,10 +304,12 @@ class openstack_project::template (
     # 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',
+        location => 'http://apt.puppetlabs.com',
+        repos    => 'main',
+        key      => {
+          'id'     =>'4BD6EC30',
+          'server' => 'pgp.mit.edu',
+        },
       }
     }