diff --git a/src/servala/core/admin.py b/src/servala/core/admin.py
index c7dbb0d..665c291 100644
--- a/src/servala/core/admin.py
+++ b/src/servala/core/admin.py
@@ -123,7 +123,7 @@ class ControlPlaneAdmin(admin.ModelAdmin):
     fieldsets = (
         (
             None,
-            {"fields": ("name", "description", "cloud_provider")},
+            {"fields": ("name", "description", "cloud_provider", "service_definition")},
         ),
         (
             _("API Credentials"),
@@ -175,15 +175,15 @@ class PlanAdmin(admin.ModelAdmin):
 @admin.register(ServiceDefinition)
 class ServiceDefinitionAdmin(admin.ModelAdmin):
     form = ServiceDefinitionAdminForm
-    list_display = ("name", "service", "control_plane")
-    list_filter = ("service", "control_plane")
+    list_display = ("name", "service")
+    list_filter = ("service", "control_planes")
     search_fields = ("name", "description")
-    autocomplete_fields = ("service", "control_plane")
+    autocomplete_fields = ("service",)
 
     fieldsets = (
         (
             None,
-            {"fields": ("name", "description", "service", "control_plane")},
+            {"fields": ("name", "description", "service")},
         ),
         (
             _("API Definition"),
diff --git a/src/servala/core/migrations/0007_service_slug.py b/src/servala/core/migrations/0006_service_slug.py
similarity index 87%
rename from src/servala/core/migrations/0007_service_slug.py
rename to src/servala/core/migrations/0006_service_slug.py
index e4e6e48..f15e796 100644
--- a/src/servala/core/migrations/0007_service_slug.py
+++ b/src/servala/core/migrations/0006_service_slug.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("core", "0006_service_definitions"),
+        ("core", "0005_remove_controlplane_k8s_api_endpoint"),
     ]
 
     operations = [
diff --git a/src/servala/core/migrations/0006_service_definitions.py b/src/servala/core/migrations/0007_service_definitions.py
similarity index 82%
rename from src/servala/core/migrations/0006_service_definitions.py
rename to src/servala/core/migrations/0007_service_definitions.py
index 9426209..bdc11e1 100644
--- a/src/servala/core/migrations/0006_service_definitions.py
+++ b/src/servala/core/migrations/0007_service_definitions.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.2b1 on 2025-03-24 14:24
+# Generated by Django 5.2b1 on 2025-03-24 14:41
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("core", "0005_remove_controlplane_k8s_api_endpoint"),
+        ("core", "0006_service_slug"),
     ]
 
     operations = [
@@ -42,15 +42,6 @@ class Migration(migrations.Migration):
                         verbose_name="API Definition",
                     ),
                 ),
-                (
-                    "control_plane",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="service_definitions",
-                        to="core.controlplane",
-                        verbose_name="Control Plane",
-                    ),
-                ),
                 (
                     "service",
                     models.ForeignKey(
diff --git a/src/servala/core/models/service.py b/src/servala/core/models/service.py
index 986f9dd..9648ba4 100644
--- a/src/servala/core/models/service.py
+++ b/src/servala/core/models/service.py
@@ -256,12 +256,6 @@ class ServiceDefinition(models.Model):
         null=True,
         blank=True,
     )
-    control_plane = models.ForeignKey(
-        to="ControlPlane",
-        on_delete=models.CASCADE,
-        related_name="service_definitions",
-        verbose_name=_("Control Plane"),
-    )
     service = models.ForeignKey(
         to="Service",
         on_delete=models.CASCADE,