diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml
index 6264a37a6b..1c83293c6a 100644
--- a/environments/undercloud/undercloud-minion.yaml
+++ b/environments/undercloud/undercloud-minion.yaml
@@ -147,7 +147,6 @@ resource_registry:
   OS::TripleO::Services::MistralExecutor: OS::Heat::None
   OS::TripleO::Services::Multipathd: OS::Heat::None
   OS::TripleO::Services::MySQL: OS::Heat::None
-  OS::TripleO::Services::NeutronAZConfig: OS::Heat::None
   OS::TripleO::Services::NeutronApi: OS::Heat::None
   OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
   OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml
index de9ecb3b5e..6139d1a7b7 100644
--- a/sample-env-generator/undercloud-minion.yaml
+++ b/sample-env-generator/undercloud-minion.yaml
@@ -171,7 +171,6 @@ environments:
       OS::TripleO::Services::Multipathd: OS::Heat::None
       OS::TripleO::Services::MySQL: OS::Heat::None
       OS::TripleO::Services::NeutronApi: OS::Heat::None
-      OS::TripleO::Services::NeutronAZConfig: OS::Heat::None
       OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
       OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
       OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None