diff --git a/netbox/dcim/migrations/0189_devicebay_module_devicebaytemplate_module_type_and_more.py b/netbox/dcim/migrations/0189_devicebay_module_devicebaytemplate_module_type_and_more.py
new file mode 100644
index 000000000..6cd8001d2
--- /dev/null
+++ b/netbox/dcim/migrations/0189_devicebay_module_devicebaytemplate_module_type_and_more.py
@@ -0,0 +1,47 @@
+# Generated by Django 5.0.7 on 2024-07-23 10:07
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0188_racktype'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='devicebay',
+            name='module',
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='%(class)ss',
+                to='dcim.module',
+            ),
+        ),
+        migrations.AddField(
+            model_name='devicebaytemplate',
+            name='module_type',
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='%(class)ss',
+                to='dcim.moduletype',
+            ),
+        ),
+        migrations.AlterField(
+            model_name='devicebaytemplate',
+            name='device_type',
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name='%(class)ss',
+                to='dcim.devicetype',
+            ),
+        ),
+    ]
diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py
index dacd7ec3e..46cb2bbe2 100644
--- a/netbox/dcim/models/device_component_templates.py
+++ b/netbox/dcim/models/device_component_templates.py
@@ -663,7 +663,7 @@ class ModuleBayTemplate(ComponentTemplateModel):
         }
 
 
-class DeviceBayTemplate(ComponentTemplateModel):
+class DeviceBayTemplate(ModularComponentTemplateModel):
     """
     A template for a DeviceBay to be created for a new parent Device.
     """
diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py
index 9438b741f..80533eeae 100644
--- a/netbox/dcim/models/device_components.py
+++ b/netbox/dcim/models/device_components.py
@@ -1108,7 +1108,7 @@ class ModuleBay(ComponentModel, TrackingModelMixin):
         return reverse('dcim:modulebay', kwargs={'pk': self.pk})
 
 
-class DeviceBay(ComponentModel, TrackingModelMixin):
+class DeviceBay(ModularComponentModel, TrackingModelMixin):
     """
     An empty space within a Device which can house a child device
     """