diff --git a/netbox/templates/core/background_tasks.html b/netbox/templates/core/background_tasks.html
index d2ad030bb..957741411 100644
--- a/netbox/templates/core/background_tasks.html
+++ b/netbox/templates/core/background_tasks.html
@@ -1,19 +1,9 @@
-{% extends 'base/layout.html' %}
-{% load buttons %}
-{% load helpers %}
+{% extends 'generic/_base.html' %}
 {% load i18n %}
 {% load render_table from django_tables2 %}
 
 {% block title %}{% trans "Background Tasks" %}{% endblock %}
 
-{% block controls %}
-  <div class="controls">
-    <div class="control-group">
-      {% block extra_controls %}{% endblock %}
-    </div>
-  </div>
-{% endblock controls %}
-
 {% block tabs %}
   <ul class="nav nav-tabs px-3">
     <li class="nav-item" role="presentation">
@@ -22,9 +12,6 @@
   </ul>
 {% endblock tabs %}
 
-{% block content-wrapper %}
-  <div class="tab-content">
-    {% render_table table %}
-
-  </div>
-{% endblock content-wrapper %}
+{% block content %}
+  {% render_table table %}
+{% endblock content %}
diff --git a/netbox/templates/core/background_tasks_job.html b/netbox/templates/core/background_tasks_job.html
index 84a4b8588..fee8a956d 100644
--- a/netbox/templates/core/background_tasks_job.html
+++ b/netbox/templates/core/background_tasks_job.html
@@ -1,24 +1,17 @@
-{% extends 'base/layout.html' %}
-{% load buttons %}
-{% load helpers %}
+{% extends 'generic/object.html' %}
 {% load i18n %}
+{% load helpers %}
 {% load render_table from django_tables2 %}
 
-{% block header %}
-  <div class="d-flex justify-content-between align-items-center">
-    {# Breadcrumbs #}
-    <nav class="breadcrumb-container px-3" aria-label="breadcrumb">
-      <ol class="breadcrumb">
-        <li class="breadcrumb-item"><a href="{% url 'core:background_tasks_list' %}">{% trans 'Background Tasks' %}</a></li>
-        <li class="breadcrumb-item"><a href="{% url 'core:background_tasks_queues' queue_index=queue_index %}">{{ queue.name }}</a></li>
-      </ol>
-    </nav>
-  </div>
-  {{ block.super }}
-{% endblock header %}
+{% block breadcrumbs %}
+  <li class="breadcrumb-item"><a href="{% url 'core:background_tasks_list' %}">{% trans 'Background Tasks' %}</a></li>
+  <li class="breadcrumb-item"><a href="{% url 'core:background_tasks_queues' queue_index=queue_index %}">{{ queue.name }}</a></li>
+{% endblock breadcrumbs %}
 
 {% block title %}{% trans "Job" %} {{ job.id }}{% endblock %}
 
+{% block object_identifier %}{% endblock %}
+
 {% block controls %}
   <div class="controls">
     <div class="control-group">
@@ -35,8 +28,7 @@
   </ul>
 {% endblock tabs %}
 
-{% block content-wrapper %}
-  <div class="tab-content">
+{% block content %}
     <div class="row">
       <div class="col col-md-12">
         <div class="card">
@@ -88,5 +80,4 @@
         </div>
       </div>
     </div>
-  </div>
-{% endblock content-wrapper %}
+{% endblock content %}
diff --git a/netbox/templates/core/background_tasks_queue.html b/netbox/templates/core/background_tasks_queue.html
index 839e379a5..0ad55955e 100644
--- a/netbox/templates/core/background_tasks_queue.html
+++ b/netbox/templates/core/background_tasks_queue.html
@@ -1,10 +1,8 @@
-{% extends 'base/layout.html' %}
-{% load buttons %}
-{% load helpers %}
+{% extends 'generic/_base.html' %}
 {% load i18n %}
 {% load render_table from django_tables2 %}
 
-{% block header %}
+{% block page-header %}
   <div class="d-flex justify-content-between align-items-center">
     {# Breadcrumbs #}
     <nav class="breadcrumb-container px-3" aria-label="breadcrumb">
@@ -14,18 +12,10 @@
     </nav>
   </div>
   {{ block.super }}
-{% endblock header %}
+{% endblock page-header %}
 
 {% block title %}{% trans "Queued Jobs in " %}{{ queue.name }}{% endblock %}
 
-{% block controls %}
-  <div class="controls">
-    <div class="control-group">
-      {% block extra_controls %}{% endblock %}
-    </div>
-  </div>
-{% endblock controls %}
-
 {% block tabs %}
   <ul class="nav nav-tabs px-3">
     <li class="nav-item" role="presentation">
@@ -34,9 +24,6 @@
   </ul>
 {% endblock tabs %}
 
-{% block content-wrapper %}
-  <div class="tab-content">
-    {% render_table table %}
-
-  </div>
-{% endblock content-wrapper %}
+{% block content %}
+  {% render_table table %}
+{% endblock content %}