diff --git a/netbox/circuits/migrations/0016_circuit_choicefields_to_slugs.py b/netbox/circuits/migrations/0016_circuit_status_to_slug.py
similarity index 96%
rename from netbox/circuits/migrations/0016_circuit_choicefields_to_slugs.py
rename to netbox/circuits/migrations/0016_circuit_status_to_slug.py
index 5232abe26..f70698c23 100644
--- a/netbox/circuits/migrations/0016_circuit_choicefields_to_slugs.py
+++ b/netbox/circuits/migrations/0016_circuit_status_to_slug.py
@@ -18,6 +18,7 @@ def circuit_status_to_slug(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
+    atomic = False
 
     dependencies = [
         ('circuits', '0015_custom_tag_models'),
@@ -31,5 +32,5 @@ class Migration(migrations.Migration):
         ),
         migrations.RunPython(
             code=circuit_status_to_slug
-        )
+        ),
     ]
diff --git a/netbox/dcim/migrations/0078_rack_choicefields_to_slugs.py b/netbox/dcim/migrations/0078_rack_type_to_slug.py
similarity index 55%
rename from netbox/dcim/migrations/0078_rack_choicefields_to_slugs.py
rename to netbox/dcim/migrations/0078_rack_type_to_slug.py
index b20cf23e8..33c9c8f7b 100644
--- a/netbox/dcim/migrations/0078_rack_choicefields_to_slugs.py
+++ b/netbox/dcim/migrations/0078_rack_type_to_slug.py
@@ -8,14 +8,6 @@ RACK_TYPE_CHOICES = (
     (1100, 'wall-cabinet'),
 )
 
-RACK_STATUS_CHOICES = (
-    (0, 'reserved'),
-    (1, 'available'),
-    (2, 'planned'),
-    (3, 'active'),
-    (4, 'deprecated'),
-)
-
 
 def rack_type_to_slug(apps, schema_editor):
     Rack = apps.get_model('dcim', 'Rack')
@@ -23,20 +15,14 @@ def rack_type_to_slug(apps, schema_editor):
         Rack.objects.filter(type=str(id)).update(type=slug)
 
 
-def rack_status_to_slug(apps, schema_editor):
-    Rack = apps.get_model('dcim', 'Rack')
-    for id, slug in RACK_STATUS_CHOICES:
-        Rack.objects.filter(status=str(id)).update(status=slug)
-
-
 class Migration(migrations.Migration):
+    atomic = False
 
     dependencies = [
         ('dcim', '0077_power_types'),
     ]
 
     operations = [
-        # Rack.type
         migrations.AlterField(
             model_name='rack',
             name='type',
@@ -45,13 +31,4 @@ class Migration(migrations.Migration):
         migrations.RunPython(
             code=rack_type_to_slug
         ),
-        # Rack.status
-        migrations.AlterField(
-            model_name='rack',
-            name='status',
-            field=models.CharField(blank=True, default='active', max_length=50),
-        ),
-        migrations.RunPython(
-            code=rack_status_to_slug
-        ),
     ]
diff --git a/netbox/dcim/migrations/0079_rack_status_to_slug.py b/netbox/dcim/migrations/0079_rack_status_to_slug.py
new file mode 100644
index 000000000..1760c321e
--- /dev/null
+++ b/netbox/dcim/migrations/0079_rack_status_to_slug.py
@@ -0,0 +1,34 @@
+from django.db import migrations, models
+
+RACK_STATUS_CHOICES = (
+    (0, 'reserved'),
+    (1, 'available'),
+    (2, 'planned'),
+    (3, 'active'),
+    (4, 'deprecated'),
+)
+
+
+def rack_status_to_slug(apps, schema_editor):
+    Rack = apps.get_model('dcim', 'Rack')
+    for id, slug in RACK_STATUS_CHOICES:
+        Rack.objects.filter(status=str(id)).update(status=slug)
+
+
+class Migration(migrations.Migration):
+    atomic = False
+
+    dependencies = [
+        ('dcim', '0078_rack_type_to_slug'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rack',
+            name='status',
+            field=models.CharField(blank=True, default='active', max_length=50),
+        ),
+        migrations.RunPython(
+            code=rack_status_to_slug
+        ),
+    ]
diff --git a/netbox/dcim/migrations/0079_device_choicefields_to_slugs.py b/netbox/dcim/migrations/0080_device_face_to_slug.py
similarity index 78%
rename from netbox/dcim/migrations/0079_device_choicefields_to_slugs.py
rename to netbox/dcim/migrations/0080_device_face_to_slug.py
index 572c1866c..93d9c7609 100644
--- a/netbox/dcim/migrations/0079_device_choicefields_to_slugs.py
+++ b/netbox/dcim/migrations/0080_device_face_to_slug.py
@@ -6,26 +6,26 @@ DEVICE_FACE_CHOICES = (
 )
 
 
-def rack_type_to_slug(apps, schema_editor):
+def device_face_to_slug(apps, schema_editor):
     Device = apps.get_model('dcim', 'Device')
     for id, slug in DEVICE_FACE_CHOICES:
         Device.objects.filter(face=str(id)).update(face=slug)
 
 
 class Migration(migrations.Migration):
+    atomic = False
 
     dependencies = [
-        ('dcim', '0078_rack_choicefields_to_slugs'),
+        ('dcim', '0079_rack_status_to_slug'),
     ]
 
     operations = [
-        # Device.face
         migrations.AlterField(
             model_name='device',
             name='face',
             field=models.CharField(blank=True, default='', max_length=50),
         ),
         migrations.RunPython(
-            code=rack_type_to_slug
+            code=device_face_to_slug
         ),
     ]