diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index 81cf6a851b..bfd96911ac 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -14,7 +14,6 @@ resource_registry:
   OS::TripleO::Network::Ports::ExternalVipPort: ../network/ports/external_from_pool.yaml
 
   OS::TripleO::Services::ComputeNeutronOvsAgent: ../deployment/neutron/neutron-ovs-agent-container-puppet.yaml
-  OS::TripleO::Services::NeutronMetadataAgent: ../deployment/neutron/neutron-metadata-container-puppet.yaml
   OS::TripleO::Services::NeutronOvsAgent: ../deployment/neutron/neutron-ovs-agent-container-puppet.yaml
   OS::TripleO::Services::NeutronDhcpAgent: ../deployment/neutron/neutron-dhcp-container-puppet.yaml
   OS::TripleO::Services::NeutronL3Agent: ../deployment/neutron/neutron-l3-container-puppet.yaml
@@ -39,6 +38,8 @@ resource_registry:
   OS::TripleO::Services::CinderApi: OS::Heat::None
   OS::TripleO::Services::CinderScheduler: OS::Heat::None
   OS::TripleO::Services::CinderVolume: OS::Heat::None
+  OS::TripleO::Services::NovaMetadata: OS::Heat::None
+  OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
 
   # Services we don't ever want configured. See LP#1824030
   OS::TripleO::Services::Pacemaker: OS::Heat::None
@@ -191,8 +192,7 @@ parameter_defaults:
   MySQLServerOptions:
     mysqld:
       connect_timeout: 60
-  NeutronMetadataProxySharedSecret: ''
-  MetadataNATRule: true
+  MetadataNATRule: false
   # TODO(emilien) Remove when Keepalived 2.0.6 is out
   # https://bugs.launchpad.net/tripleo/+bug/1791238
   KeepalivedRestart: true
diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml
index 113a83015f..5bbad2f7c0 100644
--- a/roles/Undercloud.yaml
+++ b/roles/Undercloud.yaml
@@ -70,7 +70,6 @@
     - OS::TripleO::Services::NovaApi
     - OS::TripleO::Services::NovaConductor
     - OS::TripleO::Services::NovaIronic
-    - OS::TripleO::Services::NovaMetadata
     - OS::TripleO::Services::NovaScheduler
     - OS::TripleO::Services::Novajoin
     - OS::TripleO::Services::OpenStackClients
diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml
index dd98d0eca0..980e638cec 100644
--- a/roles_data_undercloud.yaml
+++ b/roles_data_undercloud.yaml
@@ -73,7 +73,6 @@
     - OS::TripleO::Services::NovaApi
     - OS::TripleO::Services::NovaConductor
     - OS::TripleO::Services::NovaIronic
-    - OS::TripleO::Services::NovaMetadata
     - OS::TripleO::Services::NovaScheduler
     - OS::TripleO::Services::Novajoin
     - OS::TripleO::Services::OpenStackClients