diff --git a/ram/metadata/migrations/0025_alter_company_options_alter_manufacturer_options_and_more.py b/ram/metadata/migrations/0025_alter_company_options_alter_manufacturer_options_and_more.py
new file mode 100644
index 0000000..0a1afe6
--- /dev/null
+++ b/ram/metadata/migrations/0025_alter_company_options_alter_manufacturer_options_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 5.1.4 on 2025-05-04 20:45
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "metadata",
+            "0024_remove_genericdocument_tags_delete_decoderdocument_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="company",
+            options={"ordering": ["slug"], "verbose_name_plural": "Companies"},
+        ),
+        migrations.AlterModelOptions(
+            name="manufacturer",
+            options={"ordering": ["category", "slug"]},
+        ),
+        migrations.AlterModelOptions(
+            name="tag",
+            options={"ordering": ["slug"]},
+        ),
+    ]
diff --git a/ram/metadata/models.py b/ram/metadata/models.py
index 29a3ae8..23f5f63 100644
--- a/ram/metadata/models.py
+++ b/ram/metadata/models.py
@@ -43,7 +43,7 @@ class Manufacturer(models.Model):
     )
 
     class Meta:
-        ordering = ["category", "name"]
+        ordering = ["category", "slug"]
 
     def __str__(self):
         return self.name
@@ -78,7 +78,7 @@ class Company(models.Model):
 
     class Meta:
         verbose_name_plural = "Companies"
-        ordering = ["name"]
+        ordering = ["slug"]
 
     def __str__(self):
         return self.name
@@ -207,7 +207,7 @@ class Tag(models.Model):
     slug = models.CharField(max_length=128, unique=True)
 
     class Meta:
-        ordering = ["name"]
+        ordering = ["slug"]
 
     def __str__(self):
         return self.name