diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 1125667ea8..d96ff05983 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -18,16 +18,9 @@ resource_registry:
   OS::TripleO::Tasks::{{role.name}}PostConfig: OS::Heat::None
   OS::TripleO::{{role.name}}ExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
   # Port assignments for the {{role.name}} role
-  {%- if role.name != 'ObjectStorage' %}
-    {%- for network in networks %}
+  {%- for network in networks %}
   OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: network/ports/noop.yaml
-    {%- endfor %}
-  {%- else %}
-  # Note we have to special-case ObjectStorage for backwards compatibility
-    {%- for network in networks %}
-  OS::TripleO::ObjectStorage::Ports::{{network.name}}Port: network/ports/noop.yaml
-    {%- endfor %}
-  {%- endif %}
+  {%- endfor %}
   OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml
 {% endfor %}