diff --git a/linux/files/ovs_bridge b/linux/files/ovs_bridge
index bf9b74f..40acb04 100644
--- a/linux/files/ovs_bridge
+++ b/linux/files/ovs_bridge
@@ -12,3 +12,6 @@
 {%- if bridge.ovs_options is defined %}
 ovs_options {{ bridge.ovs_options }}
 {%- endif %}
+{%- if bridge_ports %}
+ovs_ports {{ bridge_ports }}
+{%- endif %}
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index 65e7bb8..a0977fe 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -132,6 +132,8 @@
   openvswitch_bridge.present:
   - name: {{ interface_name }}
 
+{%- set ovs_ports = [] %}
+
 {# add linux network interface into OVS bridge #}
 {%- for int_name, int in network.interface.items() %}
 
@@ -144,6 +146,11 @@
     - unless: ovs-vsctl show | grep {{ int_name }}
     - name: ovs-vsctl{%- if network.ovs_nowait %} --no-wait{%- endif %} add-port {{ interface_name }} {{ int_name }}
 {%- endif %}
+
+{%- if int.bridge is defined and interface_name == int.bridge %}
+{%-   do ovs_ports.append(int_name) %}
+{%- endif %}
+
 {%- endfor %}
 
 linux_interfaces_include_{{ interface_name }}:
@@ -162,6 +169,7 @@
   - defaults:
       bridge: {{ interface|yaml }}
       bridge_name: {{ interface_name }}
+      bridge_ports: {{ " ".join(ovs_ports) }}
   - template: jinja
 
 ovs_bridge_up_{{ interface_name }}: