diff --git a/scanpipe/migrations/0028_codebaserelation_and_more.py b/scanpipe/migrations/0028_codebaserelation_and_more.py
index c50e29d88..9ee808186 100644
--- a/scanpipe/migrations/0028_codebaserelation_and_more.py
+++ b/scanpipe/migrations/0028_codebaserelation_and_more.py
@@ -1,7 +1,8 @@
-# Generated by Django 4.2 on 2023-04-17 16:53
+# Generated by Django 4.2 on 2023-04-18 06:33
 
 from django.db import migrations, models
 import django.db.models.deletion
+import uuid
 
 
 class Migration(migrations.Migration):
@@ -14,12 +15,14 @@ class Migration(migrations.Migration):
             name="CodebaseRelation",
             fields=[
                 (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
+                    "uuid",
+                    models.UUIDField(
+                        db_index=True,
+                        default=uuid.uuid4,
+                        editable=False,
                         primary_key=True,
                         serialize=False,
-                        verbose_name="ID",
+                        verbose_name="UUID",
                     ),
                 ),
                 (
@@ -44,13 +47,17 @@ class Migration(migrations.Migration):
                 ("match_type", models.CharField(max_length=30)),
             ],
             options={
-                "ordering": ["from_resource__path"],
+                "ordering": ["from_resource__path", "to_resource__path"],
             },
         ),
         migrations.AlterUniqueTogether(
             name="codebaseresource",
             unique_together=set(),
         ),
+        migrations.AddIndex(
+            model_name="codebaseresource",
+            index=models.Index(fields=["path"], name="scanpipe_co_path_6abc6a_idx"),
+        ),
         migrations.AddIndex(
             model_name="codebaseresource",
             index=models.Index(fields=["name"], name="scanpipe_co_name_4da308_idx"),
diff --git a/scanpipe/models.py b/scanpipe/models.py
index b5f9cd8eb..a482ad84a 100644
--- a/scanpipe/models.py
+++ b/scanpipe/models.py
@@ -1627,6 +1627,7 @@ class Compliance(models.TextChoices):
 
     class Meta:
         indexes = [
+            models.Index(fields=["path"]),
             models.Index(fields=["name"]),
             models.Index(fields=["extension"]),
             models.Index(fields=["programming_language"]),
@@ -1933,6 +1934,7 @@ def as_spdx(self):
 
 
 class CodebaseRelation(
+    UUIDPKModel,
     ProjectRelatedModel,
     ExtraDataFieldMixin,
     models.Model,
@@ -1965,7 +1967,7 @@ class Relationship(models.TextChoices):
     )
 
     class Meta:
-        ordering = ["from_resource__path"]
+        ordering = ["from_resource__path", "to_resource__path"]
 
     def __str__(self):
         return (