diff --git a/charts/console-rapid/charts/controller-0.0.166.tgz b/charts/console-rapid/charts/controller-0.0.166.tgz
index 37ed2fd709..dbf46881a4 100644
Binary files a/charts/console-rapid/charts/controller-0.0.166.tgz and b/charts/console-rapid/charts/controller-0.0.166.tgz differ
diff --git a/charts/console-rapid/charts/kas-0.3.1.tgz b/charts/console-rapid/charts/kas-0.3.1.tgz
index 1a2228157c..d204ffb83a 100644
Binary files a/charts/console-rapid/charts/kas-0.3.1.tgz and b/charts/console-rapid/charts/kas-0.3.1.tgz differ
diff --git a/charts/console/charts/controller-0.0.166.tgz b/charts/console/charts/controller-0.0.166.tgz
index d257d8c419..cb8c74b885 100644
Binary files a/charts/console/charts/controller-0.0.166.tgz and b/charts/console/charts/controller-0.0.166.tgz differ
diff --git a/charts/console/charts/kas-0.3.1.tgz b/charts/console/charts/kas-0.3.1.tgz
index ef68240b94..05e4271f9a 100644
Binary files a/charts/console/charts/kas-0.3.1.tgz and b/charts/console/charts/kas-0.3.1.tgz differ
diff --git a/go/controller/internal/client/service.go b/go/controller/internal/client/service.go
index 19bd369d24..0b2d326eb5 100644
--- a/go/controller/internal/client/service.go
+++ b/go/controller/internal/client/service.go
@@ -84,7 +84,7 @@ func (c *client) IsServiceDeleting(id string) bool {
 		return false
 	}
 
-	return service != nil && service.DeletedAt != nil
+	return service != nil && service.ServiceDeploymentFragment.DeletedAt != nil
 }
 
 func (c *client) CreateService(clusterId *string, attributes console.ServiceDeploymentAttributes) (*console.ServiceDeploymentExtended, error) {
diff --git a/go/controller/internal/controller/servicedeployment_controller.go b/go/controller/internal/controller/servicedeployment_controller.go
index 902045b35a..2d087b844c 100644
--- a/go/controller/internal/controller/servicedeployment_controller.go
+++ b/go/controller/internal/controller/servicedeployment_controller.go
@@ -204,7 +204,7 @@ func (r *ServiceDeploymentReconciler) Process(ctx context.Context, req ctrl.Requ
 	}
 
 	if service.Status.HasSHA() && !service.Status.IsSHAEqual(sha) {
-		if err := r.ConsoleClient.UpdateService(existingService.ID, updater); err != nil {
+		if err := r.ConsoleClient.UpdateService(existingService.ServiceDeploymentFragment.ServiceDeploymentBaseFragment.ID, updater); err != nil {
 			utils.MarkCondition(service.SetCondition, v1alpha1.SynchronizedConditionType, v1.ConditionFalse, v1alpha1.SynchronizedConditionReason, err.Error())
 			return ctrl.Result{}, err
 		}
@@ -241,7 +241,7 @@ func (r *ServiceDeploymentReconciler) getClusterID(ctx context.Context, service
 }
 
 func updateStatus(r *v1alpha1.ServiceDeployment, existingService *console.ServiceDeploymentExtended, sha string) {
-	r.Status.ID = &existingService.ID
+	r.Status.ID = &existingService.ServiceDeploymentFragment.ServiceDeploymentBaseFragment.ID
 	r.Status.SHA = &sha
 	if existingService.Errors != nil {
 		r.Status.Errors = algorithms.Map(existingService.Errors,
@@ -253,7 +253,7 @@ func updateStatus(r *v1alpha1.ServiceDeployment, existingService *console.Servic
 			})
 	}
 	r.Status.Components = make([]v1alpha1.ServiceComponent, 0)
-	for _, c := range existingService.Components {
+	for _, c := range existingService.ServiceDeploymentFragment.Components {
 		sc := v1alpha1.ServiceComponent{
 			ID:        c.ID,
 			Name:      c.Name,
diff --git a/go/controller/internal/controller/servicedeployment_controller_test.go b/go/controller/internal/controller/servicedeployment_controller_test.go
index a9aecfca21..cac91480e4 100644
--- a/go/controller/internal/controller/servicedeployment_controller_test.go
+++ b/go/controller/internal/controller/servicedeployment_controller_test.go
@@ -150,7 +150,11 @@ var _ = Describe("Service Controller", Ordered, func() {
 					},
 				},
 				returnGetService: &gqlclient.ServiceDeploymentExtended{
-					ID: "123",
+					ServiceDeploymentFragment: gqlclient.ServiceDeploymentFragment{
+						ServiceDeploymentBaseFragment: gqlclient.ServiceDeploymentBaseFragment{
+							ID: "123",
+						},
+					},
 				},
 			}
 
@@ -210,7 +214,11 @@ var _ = Describe("Service Controller", Ordered, func() {
 					},
 				},
 				returnGetService: &gqlclient.ServiceDeploymentExtended{
-					ID: "123",
+					ServiceDeploymentFragment: gqlclient.ServiceDeploymentFragment{
+						ServiceDeploymentBaseFragment: gqlclient.ServiceDeploymentBaseFragment{
+							ID: "123",
+						},
+					},
 				},
 			}
 
@@ -276,7 +284,11 @@ var _ = Describe("Service Controller", Ordered, func() {
 					},
 				},
 				returnGetService: &gqlclient.ServiceDeploymentExtended{
-					ID: "123",
+					ServiceDeploymentFragment: gqlclient.ServiceDeploymentFragment{
+						ServiceDeploymentBaseFragment: gqlclient.ServiceDeploymentBaseFragment{
+							ID: "123",
+						},
+					},
 				},
 			}
 			dep1 := "dep-1"
@@ -463,7 +475,11 @@ var _ = Describe("wait for resources", Ordered, func() {
 					},
 				},
 				returnGetService: &gqlclient.ServiceDeploymentExtended{
-					ID: "123",
+					ServiceDeploymentFragment: gqlclient.ServiceDeploymentFragment{
+						ServiceDeploymentBaseFragment: gqlclient.ServiceDeploymentBaseFragment{
+							ID: "123",
+						},
+					},
 				},
 			}
 
@@ -809,7 +825,11 @@ var _ = Describe("Get DiffNormalizerAttributes", Ordered, func() {
 					},
 				},
 				returnGetService: &gqlclient.ServiceDeploymentExtended{
-					ID: "123",
+					ServiceDeploymentFragment: gqlclient.ServiceDeploymentFragment{
+						ServiceDeploymentBaseFragment: gqlclient.ServiceDeploymentBaseFragment{
+							ID: "123",
+						},
+					},
 				},
 			}