diff --git a/Puppetfile b/Puppetfile
index d49e5d2d..b6ef4f43 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -40,7 +40,7 @@ mod 'keystone',
   :ref => '4b2623d4ec41957b0274d8a457e3019fdf1e342b'
 mod 'neutron',
   :git => 'git://github.com/enovance/puppet-neutron.git',
-  :ref => '183541d3890cd212db5a581470bdf98c21c40ad7'
+  :ref => 'e981bc2533b349fae3e06ca3989f1bceece94610'
 mod 'nova',
   :git => 'git://github.com/enovance/puppet-nova.git',
   :ref => 'cc1a2a348a7953298c75881a5c4afafeb3d0a4e4'
diff --git a/manifests/network/metadata.pp b/manifests/network/metadata.pp
index 56d55437..7cf5a38a 100644
--- a/manifests/network/metadata.pp
+++ b/manifests/network/metadata.pp
@@ -76,15 +76,18 @@ class cloud::network::metadata(
   include 'cloud::network::vswitch'
 
   class { 'neutron::agents::metadata':
-    enabled           => $enabled,
-    shared_secret     => $neutron_metadata_proxy_shared_secret,
-    debug             => $debug,
-    metadata_ip       => $nova_metadata_server,
-    auth_url          => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/v2.0",
-    auth_password     => $ks_neutron_password,
-    auth_region       => $auth_region,
-    metadata_workers  => $::processorcount,
-    metadata_protocol => $ks_nova_internal_proto,
+    enabled          => $enabled,
+    shared_secret    => $neutron_metadata_proxy_shared_secret,
+    debug            => $debug,
+    metadata_ip      => $nova_metadata_server,
+    auth_url         => "${ks_keystone_admin_proto}://${ks_keystone_admin_host}:${ks_keystone_admin_port}/v2.0",
+    auth_password    => $ks_neutron_password,
+    auth_region      => $auth_region,
+    metadata_workers => $::processorcount,
+  }
+
+  neutron_metadata_agent_config {
+    'DEFAULT/nova_metadata_protocol': value => $ks_nova_internal_proto;
   }
 
 }