diff --git a/netbox/core/views.py b/netbox/core/views.py
index 8e84ce6d3..91c5cd6d1 100644
--- a/netbox/core/views.py
+++ b/netbox/core/views.py
@@ -188,7 +188,7 @@ class JobView(generic.ObjectView):
 class JobLogView(generic.ObjectView):
     queryset = Job.objects.all()
     actions = (DeleteObject,)
-    template_name = 'core/job_log.html'
+    template_name = 'core/job/log.html'
     tab = ViewTab(
         label=_('Log'),
         badge=lambda obj: len(obj.log_entries),
diff --git a/netbox/templates/core/job.html b/netbox/templates/core/job.html
index 49fa0231a..ae6e4d63d 100644
--- a/netbox/templates/core/job.html
+++ b/netbox/templates/core/job.html
@@ -1,27 +1,6 @@
-{% extends 'generic/object.html' %}
-{% load buttons %}
-{% load helpers %}
-{% load perms %}
+{% extends 'core/job/base.html' %}
 {% load i18n %}
 
-{% block breadcrumbs %}
-  {{ block.super }}
-  {% if object.object %}
-    <li class="breadcrumb-item">
-      <a href="{% url 'core:job_list' %}?object_type={{ object.object_type_id }}">{{ object.object|meta:"verbose_name_plural"|bettertitle }}</a>
-    </li>
-    {% with parent_jobs_viewname=object.object|viewname:"jobs" %}
-      <li class="breadcrumb-item">
-        <a href="{% url parent_jobs_viewname pk=object.object.pk %}">{{ object.object }}</a>
-      </li>
-    {% endwith %}
-  {% else %}
-    <li class="breadcrumb-item">
-      <a href="{% url 'core:job_list' %}?name={{ object.name|urlencode }}">{{ object.name }}</a>
-    </li>
-  {% endif %}
-{% endblock breadcrumbs %}
-
 {% block content %}
   <div class="row mb-3">
     <div class="col col-12 col-md-6">
diff --git a/netbox/templates/core/job_log.html b/netbox/templates/core/job/base.html
similarity index 78%
rename from netbox/templates/core/job_log.html
rename to netbox/templates/core/job/base.html
index 18a01fc79..a31c53a8a 100644
--- a/netbox/templates/core/job_log.html
+++ b/netbox/templates/core/job/base.html
@@ -3,7 +3,6 @@
 {% load helpers %}
 {% load perms %}
 {% load i18n %}
-{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}
@@ -22,13 +21,3 @@
     </li>
   {% endif %}
 {% endblock breadcrumbs %}
-
-{% block content %}
-  <div class="row mb-3">
-    <div class="col">
-      <div class="card">
-        {% render_table table %}
-      </div>
-    </div>
-  </div>
-{% endblock %}
diff --git a/netbox/templates/core/job/log.html b/netbox/templates/core/job/log.html
new file mode 100644
index 000000000..b8c727299
--- /dev/null
+++ b/netbox/templates/core/job/log.html
@@ -0,0 +1,12 @@
+{% extends 'core/job/base.html' %}
+{% load render_table from django_tables2 %}
+
+{% block content %}
+  <div class="row mb-3">
+    <div class="col">
+      <div class="card">
+        {% render_table table %}
+      </div>
+    </div>
+  </div>
+{% endblock %}