diff --git a/deployment/apache/apache-baremetal-puppet.j2.yaml b/deployment/apache/apache-baremetal-puppet.j2.yaml
index f4321016a7..d8f78a124a 100644
--- a/deployment/apache/apache-baremetal-puppet.j2.yaml
+++ b/deployment/apache/apache-baremetal-puppet.j2.yaml
@@ -58,12 +58,12 @@ resources:
     type: OS::Heat::Value
     properties:
       value:
-        # NOTE(jaosorior) Get unique network names to create
-        # certificates for those. We skip the tenant network since
-        # we don't need a certificate for that.
+        # NOTE(xek) Get unique network names to create certificates.
+        # We skip the tenant and management network (vip != false)
+        # since we don't generate certificates for those.
         - ctlplane
 {%- for network in networks if network.enabled|default(true) %}
-  {%- if network.name_lower != 'tenant' %}
+  {%- if network.vip | default(false) %}
         - {{network.name_lower}}
   {%- endif %}
 {%- endfor %}