diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py
index a85bdfe3f..38c0ab488 100644
--- a/netbox/netbox/views/generic/object_views.py
+++ b/netbox/netbox/views/generic/object_views.py
@@ -73,7 +73,6 @@ class ObjectView(BaseObjectView):
         return render(request, self.get_template_name(), {
             'object': instance,
             'tab': self.tab,
-            'page_width': 'xl',
             **self.get_extra_context(request, instance),
         })
 
diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html
index f24ba6537..071396575 100644
--- a/netbox/templates/base/layout.html
+++ b/netbox/templates/base/layout.html
@@ -41,7 +41,7 @@ Blocks:
 
     {# Top menu #}
     <header class="navbar navbar-expand-md d-none d-lg-flex d-print-none">
-      <div class="container-{{ page_width|default:"fluid" }}">
+      <div class="container-fluid">
 
         {# Nav menu toggle #}
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-menu" aria-controls="navbar-menu" aria-expanded="false" aria-label="Toggle navigation">
@@ -105,7 +105,7 @@ Blocks:
       {# Page body #}
       {% block page %}
         <div class="page-body my-1">
-          <div class="container-{{ page_width|default:"fluid" }} tab-content py-3">
+          <div class="container-fluid tab-content py-3">
 
             {# Page content #}
             {% block content %}{% endblock %}
@@ -124,7 +124,7 @@ Blocks:
 
       {# Page footer #}
       <footer class="footer footer-transparent d-print-none py-2">
-        <div class="container-{{ page_width|default:"fluid" }} d-flex justify-content-between align-items-center">
+        <div class="container-fluid d-flex justify-content-between align-items-center">
           {% block footer %}
 
             {# Footer links #}
diff --git a/netbox/templates/generic/_base.html b/netbox/templates/generic/_base.html
index 4f8f1a241..36e7178b2 100644
--- a/netbox/templates/generic/_base.html
+++ b/netbox/templates/generic/_base.html
@@ -5,7 +5,7 @@
     {{ block.super }}
 
     {% block page-header %}
-      <div class="container-{{ page_width|default:"fluid" }} mt-2 d-print-none">
+      <div class="container-fluid mt-2 d-print-none">
         <div class="d-flex justify-content-between">
 
           {# Title #}
@@ -29,7 +29,7 @@
 
     {# Tabs #}
     <div class="page-tabs mt-3">
-      <div class="container-{{ page_width|default:"fluid" }}">
+      <div class="container-fluid">
         {% block tabs %}{% endblock %}
       </div>
     </div>
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index 0b578653d..f111c20ef 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -19,7 +19,7 @@ Context:
 {% endcomment %}
 
 {% block page-header %}
-  <div class="container-{{ page_width|default:"fluid" }}">
+  <div class="container-fluid">
     <div class="d-flex justify-content-between align-items-center mt-2">
 
       {# Breadcrumbs #}