diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index b61dac6fc..22713b592 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -65,7 +65,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='circuits:circuit_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/comments.html' %}
         {% plugin_left_page object %}
 	</div>
diff --git a/netbox/templates/circuits/circuittype.html b/netbox/templates/circuits/circuittype.html
index ad81de7e1..57737a6d1 100644
--- a/netbox/templates/circuits/circuittype.html
+++ b/netbox/templates/circuits/circuittype.html
@@ -28,6 +28,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
   </div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index d353e4f37..c16afa421 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -47,7 +47,7 @@
                 </table>
             </div>
         </div>
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='circuits:provider_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
diff --git a/netbox/templates/circuits/providernetwork.html b/netbox/templates/circuits/providernetwork.html
index 18a11e115..9641c9934 100644
--- a/netbox/templates/circuits/providernetwork.html
+++ b/netbox/templates/circuits/providernetwork.html
@@ -38,7 +38,7 @@
     </div>
     <div class="col col-md-6">
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='circuits:providernetwork_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/comments.html' %}
         {% plugin_right_page object %}
     </div>
diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html
index c5d1f7906..00704e6ca 100644
--- a/netbox/templates/dcim/cable.html
+++ b/netbox/templates/dcim/cable.html
@@ -64,7 +64,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:cable_list' %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html
index c340cbc5c..60711eb9d 100644
--- a/netbox/templates/dcim/consoleport.html
+++ b/netbox/templates/dcim/consoleport.html
@@ -41,7 +41,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html
index 91de60252..f65af3285 100644
--- a/netbox/templates/dcim/consoleserverport.html
+++ b/netbox/templates/dcim/consoleserverport.html
@@ -41,7 +41,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 869ab1ec7..ea0c795c5 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -221,7 +221,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:device_list' %}
+            {% include 'inc/panels/tags.html' %}
             {% include 'inc/panels/comments.html' %}
             {% plugin_left_page object %}
         </div>
diff --git a/netbox/templates/dcim/devicebay.html b/netbox/templates/dcim/devicebay.html
index 918b6b022..ff8f90db2 100644
--- a/netbox/templates/dcim/devicebay.html
+++ b/netbox/templates/dcim/devicebay.html
@@ -33,7 +33,7 @@
                 </div>
             </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/devicerole.html b/netbox/templates/dcim/devicerole.html
index 2c2d7fe6f..22385ae27 100644
--- a/netbox/templates/dcim/devicerole.html
+++ b/netbox/templates/dcim/devicerole.html
@@ -58,6 +58,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 74a3e73d7..21a04e7d0 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -88,7 +88,7 @@
         </div>
         <div class="col col-md-6">
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:devicetype_list' %}
+            {% include 'inc/panels/tags.html' %}
             {% include 'inc/panels/comments.html' %}
             {% plugin_right_page object %}
         </div>
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
index c6b6cea48..6cc3d482f 100644
--- a/netbox/templates/dcim/frontport.html
+++ b/netbox/templates/dcim/frontport.html
@@ -53,7 +53,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 0715bec58..af038326d 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -103,7 +103,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html
index e55d441d4..163d8edb3 100644
--- a/netbox/templates/dcim/inventoryitem.html
+++ b/netbox/templates/dcim/inventoryitem.html
@@ -65,7 +65,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html
index eeb891daf..434253d43 100644
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -68,6 +68,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
   </div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html
index 792a3e127..d43a206c6 100644
--- a/netbox/templates/dcim/manufacturer.html
+++ b/netbox/templates/dcim/manufacturer.html
@@ -34,6 +34,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index bbdf809dd..8cd26a116 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -55,6 +55,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index f29a127e3..1824cac19 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -108,7 +108,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:powerfeed_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html
index 1f960e0d5..396ef42a8 100644
--- a/netbox/templates/dcim/poweroutlet.html
+++ b/netbox/templates/dcim/poweroutlet.html
@@ -45,7 +45,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html
index a99aabf32..021fa1133 100644
--- a/netbox/templates/dcim/powerpanel.html
+++ b/netbox/templates/dcim/powerpanel.html
@@ -39,7 +39,7 @@
                 </table>
             </div>
         </div>
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:powerpanel_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_left_page object %}
     </div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
index 74ad9603b..dfe428c50 100644
--- a/netbox/templates/dcim/powerport.html
+++ b/netbox/templates/dcim/powerport.html
@@ -45,7 +45,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 586d31771..93bd21fd9 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -163,7 +163,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:rack_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/comments.html' %}
         {% if power_feeds %}
             <div class="card">
diff --git a/netbox/templates/dcim/rackreservation.html b/netbox/templates/dcim/rackreservation.html
index 07ca55f7c..1e16af675 100644
--- a/netbox/templates/dcim/rackreservation.html
+++ b/netbox/templates/dcim/rackreservation.html
@@ -84,7 +84,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:rackreservation_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_left_page object %}
 	</div>
     <div class="col col-12 col-xl-7">
diff --git a/netbox/templates/dcim/rackrole.html b/netbox/templates/dcim/rackrole.html
index 2668905f4..2f4661c9f 100644
--- a/netbox/templates/dcim/rackrole.html
+++ b/netbox/templates/dcim/rackrole.html
@@ -34,6 +34,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
index b60e04882..b3ecce3ad 100644
--- a/netbox/templates/dcim/rearport.html
+++ b/netbox/templates/dcim/rearport.html
@@ -47,7 +47,7 @@
                 </div>
             </div>
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/region.html b/netbox/templates/dcim/region.html
index c03b11e7d..7452e594e 100644
--- a/netbox/templates/dcim/region.html
+++ b/netbox/templates/dcim/region.html
@@ -45,6 +45,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% include 'inc/panels/custom_fields.html' %}
     {% include 'inc/panels/contacts.html' %}
     {% plugin_left_page object %}
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index 8442ae41e..a17c505a9 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -169,7 +169,6 @@
                         <div class="float-end text-warning">
                           <i class="mdi mdi-alert" title="{{ deprecation_warning }}"></i>
                         </div>
-                        <a href="tel:{{ object.contact_
                         <a href="mailto:{{ object.contact_email }}">{{ object.contact_email }}</a>
                       {% else %}
                         <span class="text-muted">&mdash;</span>
@@ -181,7 +180,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:site_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/comments.html' %}
         {% plugin_left_page object %}
     </div>
diff --git a/netbox/templates/dcim/sitegroup.html b/netbox/templates/dcim/sitegroup.html
index dbee2c835..d04330413 100644
--- a/netbox/templates/dcim/sitegroup.html
+++ b/netbox/templates/dcim/sitegroup.html
@@ -45,6 +45,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% include 'inc/panels/custom_fields.html' %}
     {% include 'inc/panels/contacts.html' %}
     {% plugin_left_page object %}
diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html
index fd31be60d..8399576f5 100644
--- a/netbox/templates/dcim/virtualchassis.html
+++ b/netbox/templates/dcim/virtualchassis.html
@@ -39,7 +39,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:virtualchassis_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-8">
diff --git a/netbox/templates/inc/panels/tags.html b/netbox/templates/inc/panels/tags.html
index e67098c0f..c309afdf0 100644
--- a/netbox/templates/inc/panels/tags.html
+++ b/netbox/templates/inc/panels/tags.html
@@ -1,11 +1,14 @@
 {% load helpers %}
+
 <div class="card">
-  <h5 class="card-header">
-    Tags
-  </h5>
+  <h5 class="card-header">Tags</h5>
   <div class="card-body">
-    {% for tag in tags.all %} {% tag tag url %} {% empty %}
-    <span class="text-muted">No tags assigned</span>
-    {% endfor %}
+    {% with url=object|validated_viewname:"list" %}
+      {% for tag in object.tags.all %}
+        {% tag tag url %}
+      {% empty %}
+        <span class="text-muted">No tags assigned</span>
+      {% endfor %}
+    {% endwith %}
   </div>
 </div>
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index 202b6e41c..aca89a526 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -65,7 +65,7 @@
     </div>
     <div class="col col-md-6">
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:aggregate_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_right_page object %}
     </div>
 </div>
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index d98544de4..31782bdd7 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -145,7 +145,7 @@
 
 <div class="row my-3">
     <div class="col col-md-4">
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:ipaddress_list' %}
+        {% include 'inc/panels/tags.html' %}
     </div>
     
 </div>
diff --git a/netbox/templates/ipam/iprange.html b/netbox/templates/ipam/iprange.html
index e3d37a87a..b549ec7c5 100644
--- a/netbox/templates/ipam/iprange.html
+++ b/netbox/templates/ipam/iprange.html
@@ -82,7 +82,7 @@
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:prefix_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/custom_fields.html' %}
         {% plugin_right_page object %}
     </div>
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index 877ed49e0..eaea4e1ec 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -122,7 +122,7 @@
     </div>
     <div class="col col-md-6">
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:prefix_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_right_page object %}
     </div>
 </div>
diff --git a/netbox/templates/ipam/rir.html b/netbox/templates/ipam/rir.html
index 26d5e71da..c2f88c278 100644
--- a/netbox/templates/ipam/rir.html
+++ b/netbox/templates/ipam/rir.html
@@ -38,6 +38,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/ipam/role.html b/netbox/templates/ipam/role.html
index 7fc967047..5579010fa 100644
--- a/netbox/templates/ipam/role.html
+++ b/netbox/templates/ipam/role.html
@@ -32,6 +32,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/ipam/routetarget.html b/netbox/templates/ipam/routetarget.html
index f615d2d50..71d6f9601 100644
--- a/netbox/templates/ipam/routetarget.html
+++ b/netbox/templates/ipam/routetarget.html
@@ -30,7 +30,7 @@
           </table>
         </div>
       </div>
-      {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:routetarget_list' %}
+      {% include 'inc/panels/tags.html' %}
       {% include 'inc/panels/custom_fields.html' %}
       {% plugin_left_page object %}
     </div>
diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html
index 7609a280b..5a47e44f0 100644
--- a/netbox/templates/ipam/service.html
+++ b/netbox/templates/ipam/service.html
@@ -61,7 +61,7 @@
     </div>
     <div class="col col-md-6">
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:service_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% plugin_right_page object %}
     </div>
 </div>
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index e8c514cca..367ae3641 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -83,7 +83,7 @@
         </div>
         <div class="col col-md-6">
             {% include 'inc/panels/custom_fields.html' %}
-            {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:vlan_list' %}
+            {% include 'inc/panels/tags.html' %}
             {% plugin_right_page object %}
         </div>
     </div>
diff --git a/netbox/templates/ipam/vlangroup.html b/netbox/templates/ipam/vlangroup.html
index 2d31feb22..1c36e92f6 100644
--- a/netbox/templates/ipam/vlangroup.html
+++ b/netbox/templates/ipam/vlangroup.html
@@ -54,6 +54,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index b320fe6b8..349fe20d3 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -60,7 +60,7 @@
       {% plugin_left_page object %}
   </div>
   <div class="col col-md-6">
-    {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:vrf_list' %}
+    {% include 'inc/panels/tags.html' %}
     {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
 	</div>
diff --git a/netbox/templates/tenancy/contact.html b/netbox/templates/tenancy/contact.html
index 8bdf6c030..3c6ada5a0 100644
--- a/netbox/templates/tenancy/contact.html
+++ b/netbox/templates/tenancy/contact.html
@@ -60,7 +60,7 @@
     </div>
     <div class="col col-md-5">
       {% include 'inc/panels/custom_fields.html' %}
-      {% include 'inc/panels/tags.html' with tags=object.tags.all url='tenancy:tenant_list' %}
+      {% include 'inc/panels/tags.html' %}
       {% plugin_right_page object %}
     </div>
   </div>
diff --git a/netbox/templates/tenancy/contactgroup.html b/netbox/templates/tenancy/contactgroup.html
index 0eef750eb..efb86af91 100644
--- a/netbox/templates/tenancy/contactgroup.html
+++ b/netbox/templates/tenancy/contactgroup.html
@@ -45,6 +45,7 @@
           </table>
         </div>
       </div>
+      {% include 'inc/panels/tags.html' %}
       {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
diff --git a/netbox/templates/tenancy/contactrole.html b/netbox/templates/tenancy/contactrole.html
index 4ddde3624..3272728f2 100644
--- a/netbox/templates/tenancy/contactrole.html
+++ b/netbox/templates/tenancy/contactrole.html
@@ -30,6 +30,7 @@
           </table>
         </div>
       </div>
+      {% include 'inc/panels/tags.html' %}
       {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index dc51b48c5..f54fd1425 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -36,7 +36,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='tenancy:tenant_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/comments.html' %}
         {% include 'inc/panels/contacts.html' %}
         {% plugin_left_page object %}
diff --git a/netbox/templates/tenancy/tenantgroup.html b/netbox/templates/tenancy/tenantgroup.html
index 31a756d9e..75d2c5a27 100644
--- a/netbox/templates/tenancy/tenantgroup.html
+++ b/netbox/templates/tenancy/tenantgroup.html
@@ -45,6 +45,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
   </div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html
index 84b8235ad..b7af89bb2 100644
--- a/netbox/templates/virtualization/cluster.html
+++ b/netbox/templates/virtualization/cluster.html
@@ -61,7 +61,7 @@
   </div>
   <div class="col col-md-6">
     {% include 'inc/panels/custom_fields.html' %}
-    {% include 'inc/panels/tags.html' with tags=object.tags.all url='virtualization:cluster_list' %}
+    {% include 'inc/panels/tags.html' %}
     {% include 'inc/panels/contacts.html' %}
     {% plugin_right_page object %}
   </div>
diff --git a/netbox/templates/virtualization/clustergroup.html b/netbox/templates/virtualization/clustergroup.html
index b367d97f7..3979fa0e6 100644
--- a/netbox/templates/virtualization/clustergroup.html
+++ b/netbox/templates/virtualization/clustergroup.html
@@ -28,6 +28,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/virtualization/clustertype.html b/netbox/templates/virtualization/clustertype.html
index e3c050a1b..de5f3c519 100644
--- a/netbox/templates/virtualization/clustertype.html
+++ b/netbox/templates/virtualization/clustertype.html
@@ -28,6 +28,7 @@
         </table>
       </div>
     </div>
+    {% include 'inc/panels/tags.html' %}
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 0d9ea4a22..068d7f164 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -90,7 +90,7 @@
             </div>
         </div>
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all url='virtualization:virtualmachine_list' %}
+        {% include 'inc/panels/tags.html' %}
         {% include 'inc/panels/comments.html' %}
         {% plugin_left_page object %}
     </div>
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
index ef12b63a1..1678013f2 100644
--- a/netbox/templates/virtualization/vminterface.html
+++ b/netbox/templates/virtualization/vminterface.html
@@ -70,8 +70,8 @@
     </div>
     <div class="col col-md-6">
         {% include 'inc/panels/custom_fields.html' %}
-        {% include 'inc/panels/tags.html' with tags=object.tags.all %}
-          {% plugin_right_page object %}
+        {% include 'inc/panels/tags.html' %}
+        {% plugin_right_page object %}
     </div>
 </div>
 <div class="row mb-3">