diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 5ede19d78..fdb5aec08 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -585,6 +585,8 @@
                                 <th>Name</th>
                                 <th>LAG</th>
                                 <th>Description</th>
+                                <th>Tagged vlans</th>
+                                <th>Untagged vlan</th>
                                 <th>MTU</th>
                                 <th>Mode</th>
                                 <th>Cable</th>
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index 2fe970fd7..aa0d6df85 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -38,6 +38,23 @@
         {% endfor %}
     </td>
 
+    {# Tagged ports #}
+    <td>
+        {% if iface.tagged_vlans.all %}
+            {% for tag in iface.tagged_vlans.all %}
+                <a href="{% url 'ipam:vlan' tag.id %}">{{ tag }}</a>
+                <br>
+            {% endfor %}
+        {% endif %}
+    </td>
+
+    {# Untagged ports #}
+    <td>
+        {% if iface.untagged_vlan %}
+            {{ iface.untagged_vlan }}
+        {% endif %}
+    </td>
+
     {# MTU #}
     <td>{{ iface.mtu|default:"&mdash;" }}</td>