diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md
index 2cc3536b3..57c734055 100644
--- a/docs/release-notes/version-3.1.md
+++ b/docs/release-notes/version-3.1.md
@@ -8,6 +8,7 @@
 * [#8057](https://github.com/netbox-community/netbox/issues/8057) - Dynamic object tables using HTMX
 * [#8080](https://github.com/netbox-community/netbox/issues/8080) - Link to NAT IPs for device/VM primary IPs
 * [#8081](https://github.com/netbox-community/netbox/issues/8081) - Allow creating services directly from navigation menu
+* [#8108](https://github.com/netbox-community/netbox/issues/8108) - Improve breadcrumb links for device/VM components
 
 ### Bug Fixes
 
diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html
index 60711eb9d..38cfb90ae 100644
--- a/netbox/templates/dcim/consoleport.html
+++ b/netbox/templates/dcim/consoleport.html
@@ -1,7 +1,14 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
 
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li class="breadcrumb-item">
+    <a href="{% url 'dcim:device_consoleports' pk=object.device.pk %}">{{ object.device }}</a>
+  </li>
+{% endblock %}
+
 {% block content %}
     <div class="row">
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html
index f65af3285..b44c4a9b8 100644
--- a/netbox/templates/dcim/consoleserverport.html
+++ b/netbox/templates/dcim/consoleserverport.html
@@ -1,7 +1,14 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
 
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li class="breadcrumb-item">
+    <a href="{% url 'dcim:device_consoleserverports' pk=object.device.pk %}">{{ object.device }}</a>
+  </li>
+{% endblock %}
+
 {% block content %}
     <div class="row">
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/device_component.html b/netbox/templates/dcim/device_component.html
deleted file mode 100644
index fbd542774..000000000
--- a/netbox/templates/dcim/device_component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends 'generic/object.html' %}
-{% load helpers %}
-{% load perms %}
-{% load plugins %}
-
-{% block breadcrumbs %}
-  {{ block.super }}
-  <li class="breadcrumb-item"><a href="{% url object|viewname:'list' %}?device_id={{ object.device.pk }}">{{ object.device }}</a></li>
-{% endblock %}
diff --git a/netbox/templates/dcim/devicebay.html b/netbox/templates/dcim/devicebay.html
index ff8f90db2..3a470bec5 100644
--- a/netbox/templates/dcim/devicebay.html
+++ b/netbox/templates/dcim/devicebay.html
@@ -1,7 +1,14 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
 
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li class="breadcrumb-item">
+    <a href="{% url 'dcim:device_devicebays' pk=object.device.pk %}">{{ object.device }}</a>
+  </li>
+{% endblock %}
+
 {% block content %}
     <div class="row">
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
index 6cc3d482f..05be82fc9 100644
--- a/netbox/templates/dcim/frontport.html
+++ b/netbox/templates/dcim/frontport.html
@@ -1,7 +1,14 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
 
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li class="breadcrumb-item">
+    <a href="{% url 'dcim:device_frontports' pk=object.device.pk %}">{{ object.device }}</a>
+  </li>
+{% endblock %}
+
 {% block content %}
     <div class="row">
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 353bfe115..bd0569c39 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -1,8 +1,15 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
 {% load render_table from django_tables2 %}
 
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li class="breadcrumb-item">
+    <a href="{% url 'dcim:device_interfaces' pk=object.device.pk %}">{{ object.device }}</a>
+  </li>
+{% endblock %}
+
 {% block extra_controls %}
   {% if perms.dcim.add_interface and not object.is_virtual %}
     <a href="{% url 'dcim:interface_add' %}?device={{ object.device.pk }}&parent={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-success">
diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html
index 163d8edb3..36ba0469f 100644
--- a/netbox/templates/dcim/inventoryitem.html
+++ b/netbox/templates/dcim/inventoryitem.html
@@ -1,7 +1,14 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
 
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li class="breadcrumb-item">
+    <a href="{% url 'dcim:device_inventory' pk=object.device.pk %}">{{ object.device }}</a>
+  </li>
+{% endblock %}
+
 {% block content %}
     <div class="row mb-3">
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html
index 396ef42a8..3f2c469af 100644
--- a/netbox/templates/dcim/poweroutlet.html
+++ b/netbox/templates/dcim/poweroutlet.html
@@ -1,7 +1,14 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
 
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li class="breadcrumb-item">
+    <a href="{% url 'dcim:device_poweroutlets' pk=object.device.pk %}">{{ object.device }}</a>
+  </li>
+{% endblock %}
+
 {% block content %}
     <div class="row mb-3">
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
index dfe428c50..f38edec8e 100644
--- a/netbox/templates/dcim/powerport.html
+++ b/netbox/templates/dcim/powerport.html
@@ -1,7 +1,14 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
 
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li class="breadcrumb-item">
+    <a href="{% url 'dcim:device_powerports' pk=object.device.pk %}">{{ object.device }}</a>
+  </li>
+{% endblock %}
+
 {% block content %}
     <div class="row mb-3">
         <div class="col col-md-6">
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
index b3ecce3ad..311ccd7ff 100644
--- a/netbox/templates/dcim/rearport.html
+++ b/netbox/templates/dcim/rearport.html
@@ -1,7 +1,14 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
 
+{% block breadcrumbs %}
+  {{ block.super }}
+  <li class="breadcrumb-item">
+    <a href="{% url 'dcim:device_rearports' pk=object.device.pk %}">{{ object.device }}</a>
+  </li>
+{% endblock %}
+
 {% block content %}
     <div class="row">
         <div class="col col-md-6">
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
index 68b036950..6fcaf2a3e 100644
--- a/netbox/templates/virtualization/vminterface.html
+++ b/netbox/templates/virtualization/vminterface.html
@@ -5,7 +5,9 @@
 
 {% block breadcrumbs %}
   {{ block.super }}
-  <li class="breadcrumb-item"><a href="{% url 'virtualization:vminterface_list' %}?virtual_machine_id={{ object.virtual_machine.pk }}">{{ object.virtual_machine }}</a></li>
+  <li class="breadcrumb-item">
+    <a href="{% url 'virtualization:virtualmachine_interfaces' pk=object.virtual_machine.pk %}">{{ object.virtual_machine }}</a>
+  </li>
 {% endblock %}
 
 {% block content %}