diff --git a/apps/console/internal/domain/environment.go b/apps/console/internal/domain/environment.go
index 857240e3a..a3782b8d9 100644
--- a/apps/console/internal/domain/environment.go
+++ b/apps/console/internal/domain/environment.go
@@ -471,7 +471,7 @@ func (d *domain) UpdateEnvironment(ctx ConsoleContext, projectName string, env e
 		&env,
 		common.PatchOpts{
 			XPatch: repos.Document{
-				fc.EnvironmentSpec: env.Spec,
+				fc.EnvironmentSpecRouting: env.Spec.Routing,
 			},
 		},
 	)
diff --git a/apps/container-registry/internal/domain/build.go b/apps/container-registry/internal/domain/build.go
index a56fc8c96..87382b2cf 100644
--- a/apps/container-registry/internal/domain/build.go
+++ b/apps/container-registry/internal/domain/build.go
@@ -2,6 +2,7 @@ package domain
 
 import (
 	"context"
+
 	"github.com/kloudlite/api/apps/container-registry/internal/domain/entities"
 	fc "github.com/kloudlite/api/apps/container-registry/internal/domain/entities/field-constants"
 	iamT "github.com/kloudlite/api/apps/iam/types"
@@ -104,20 +105,15 @@ func (d *Impl) UpdateBuild(ctx RegistryContext, id repos.ID, build entities.Buil
 	if err := validateBuild(build); err != nil {
 		return nil, errors.NewE(err)
 	}
-	return d.buildRepo.UpdateById(ctx, id, &entities.Build{
-		Spec: func() dbv1.BuildRunSpec {
-			build.Spec.AccountName = ctx.AccountName
-			return build.Spec
-		}(),
-		Name:             build.Name,
-		BuildClusterName: build.BuildClusterName,
-		CreatedBy:        common.CreatedOrUpdatedBy{},
-		LastUpdatedBy:    common.CreatedOrUpdatedBy{UserId: ctx.UserId, UserName: ctx.UserName, UserEmail: ctx.UserEmail},
-		Source:           build.Source,
-		CredUser:         common.CreatedOrUpdatedBy{UserId: ctx.UserId, UserName: ctx.UserName, UserEmail: ctx.UserEmail},
-		ErrorMessages:    map[string]string{},
-		Status:           build.Status,
-	})
+
+	patchDoc := repos.Document{
+		fc.BuildName:             build.Name,
+		fc.BuildBuildClusterName: build.BuildClusterName,
+		fields.LastUpdatedBy:     common.CreatedOrUpdatedBy{UserId: ctx.UserId, UserName: ctx.UserName, UserEmail: ctx.UserEmail},
+		fc.BuildSource:           build.Source,
+	}
+
+	return d.buildRepo.Patch(ctx, repos.Filter{fields.Id: id}, patchDoc)
 }
 
 func (d *Impl) UpdateBuildInternal(ctx context.Context, build *entities.Build) (*entities.Build, error) {
diff --git a/apps/container-registry/internal/domain/context.go b/apps/container-registry/internal/domain/context.go
index 8c9baf47b..a024de631 100644
--- a/apps/container-registry/internal/domain/context.go
+++ b/apps/container-registry/internal/domain/context.go
@@ -2,6 +2,7 @@ package domain
 
 import (
 	"context"
+
 	"github.com/kloudlite/api/pkg/repos"
 )
 
@@ -13,6 +14,16 @@ type RegistryContext struct {
 	UserEmail   string
 }
 
-func (c *RegistryContext) GetAccountName() string {
+func (c RegistryContext) GetAccountName() string {
 	return c.AccountName
 }
+
+func (c RegistryContext) GetUserId() repos.ID {
+	return c.UserId
+}
+func (c RegistryContext) GetUserEmail() string {
+	return c.UserEmail
+}
+func (c RegistryContext) GetUserName() string {
+	return c.UserName
+}