diff --git a/environments/base-extra-node-all.yaml b/environments/base-extra-node-all.yaml
index 5cc7a0c..5ef397f 100644
--- a/environments/base-extra-node-all.yaml
+++ b/environments/base-extra-node-all.yaml
@@ -41,4 +41,5 @@ parameter_defaults:
   role: extra
 
 resource_registry:
+  OS::OVB::BMC: OS::Heat::None
   OS::OVB::BaremetalPorts: ../templates/baremetal-ports-extra-node-all.yaml
diff --git a/environments/base-extra-node.yaml b/environments/base-extra-node.yaml
index 0a708d5..dac1147 100644
--- a/environments/base-extra-node.yaml
+++ b/environments/base-extra-node.yaml
@@ -41,4 +41,5 @@ parameter_defaults:
   role: extra
 
 resource_registry:
+  OS::OVB::BMC: OS::Heat::None
   OS::OVB::BaremetalPorts: ../templates/baremetal-ports-extra-node.yaml
diff --git a/sample-env-generator/environments.yaml b/sample-env-generator/environments.yaml
index de8672c..9c5f1ee 100644
--- a/sample-env-generator/environments.yaml
+++ b/sample-env-generator/environments.yaml
@@ -76,12 +76,14 @@ environments:
       node_count: 1
     resource_registry:
       OS::OVB::BaremetalPorts: ../templates/baremetal-ports-extra-node.yaml
+      OS::OVB::BMC: OS::Heat::None
     children:
       -
         name: base-extra-node-all
         title: Base Configuration Options for Extra Nodes with All Ports Open
         resource_registry:
           OS::OVB::BaremetalPorts: ../templates/baremetal-ports-extra-node-all.yaml
+          OS::OVB::BMC: OS::Heat::None
   -
     name: all-networks
     title: Deploy with All Networks Enabled