diff --git a/cmd/zitadel/setup.yaml b/cmd/zitadel/setup.yaml
index 2a007ff05c..da17928fdf 100644
--- a/cmd/zitadel/setup.yaml
+++ b/cmd/zitadel/setup.yaml
@@ -65,6 +65,6 @@ SetUp:
                 - '$ZITADEL_CONSOLE_GRANT_TYPE'
               ApplicationType: 'USER_AGENT'
               AuthMethodType: 'NONE'
-              DevMode: '$ZITADEL_CONSOLE_DEV_MODE'
+              DevMode: $ZITADEL_CONSOLE_DEV_MODE
   Owners:
     - 'zitadel-admin@caos.ch'
\ No newline at end of file
diff --git a/internal/org/repository/eventsourcing/org.go b/internal/org/repository/eventsourcing/org.go
index 22824c0323..c8ca115cf2 100644
--- a/internal/org/repository/eventsourcing/org.go
+++ b/internal/org/repository/eventsourcing/org.go
@@ -40,7 +40,7 @@ func OrgQuery(latestSequence uint64) *es_models.SearchQuery {
 }
 
 func OrgAggregate(ctx context.Context, aggCreator *es_models.AggregateCreator, id string, sequence uint64) (*es_models.Aggregate, error) {
-	return aggCreator.NewAggregate(ctx, id, model.OrgAggregate, model.OrgVersion, sequence)
+	return aggCreator.NewAggregate(ctx, id, model.OrgAggregate, model.OrgVersion, sequence, es_models.OverwriteResourceOwner(id))
 }
 
 func orgCreatedAggregates(ctx context.Context, aggCreator *es_models.AggregateCreator, org *model.Org, users func(context.Context, string) ([]*es_models.Aggregate, error)) (_ []*es_models.Aggregate, err error) {
@@ -76,7 +76,7 @@ func addDomainAggregateAndEvents(ctx context.Context, aggCreator *es_models.Aggr
 			return nil, err
 		}
 		if domain.Verified {
-			domainAggregates, err := OrgDomainVerifiedAggregate(ctx, aggCreator, org, domain, users)
+			domainAggregates, err := orgDomainVerified(ctx, aggCreator, orgAggregate, org, domain, users)
 			if err != nil {
 				return nil, err
 			}
@@ -277,8 +277,16 @@ func OrgDomainVerifiedAggregate(ctx context.Context, aggCreator *es_models.Aggre
 	if err != nil {
 		return nil, err
 	}
-	aggregates := make([]*es_models.Aggregate, 0, 2)
-	agg, err = agg.AppendEvent(model.OrgDomainVerified, domain)
+
+	aggregates, err := orgDomainVerified(ctx, aggCreator, agg, existing, domain, users)
+	if err != nil {
+		return nil, err
+	}
+	return append(aggregates, agg), nil
+}
+
+func orgDomainVerified(ctx context.Context, aggCreator *es_models.AggregateCreator, agg *es_models.Aggregate, existing *model.Org, domain *model.OrgDomain, users func(context.Context, string) ([]*es_models.Aggregate, error)) ([]*es_models.Aggregate, error) {
+	agg, err := agg.AppendEvent(model.OrgDomainVerified, domain)
 	if err != nil {
 		return nil, err
 	}
@@ -286,7 +294,7 @@ func OrgDomainVerifiedAggregate(ctx context.Context, aggCreator *es_models.Aggre
 	if err != nil {
 		return nil, err
 	}
-	aggregates = append(aggregates, domainAgregate)
+	aggregates := []*es_models.Aggregate{domainAgregate}
 	if users != nil {
 		userAggregates, err := users(ctx, domain.Domain)
 		if err != nil {
@@ -294,7 +302,7 @@ func OrgDomainVerifiedAggregate(ctx context.Context, aggCreator *es_models.Aggre
 		}
 		aggregates = append(aggregates, userAggregates...)
 	}
-	return append(aggregates, agg), nil
+	return aggregates, nil
 }
 
 func OrgDomainSetPrimaryAggregate(aggCreator *es_models.AggregateCreator, existing *model.Org, domain *model.OrgDomain) func(ctx context.Context) (*es_models.Aggregate, error) {
diff --git a/k8s/base/deployment.yaml b/k8s/base/deployment.yaml
index 1c3035cc90..e0850d9386 100644
--- a/k8s/base/deployment.yaml
+++ b/k8s/base/deployment.yaml
@@ -20,7 +20,7 @@ spec:
       - name: zitadel
         image: docker.pkg.github.com/caos/zitadel/zitadel:latest
         imagePullPolicy: IfNotPresent
-        args: []
+        args: ["start"]
         ports:
         - name: grpc
           containerPort: 50001
@@ -28,6 +28,18 @@ spec:
           containerPort: 50002
         - name: ui
           containerPort: 50003
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: http
+          periodSeconds: 5
+          failureThreshold: 2
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: http
+          periodSeconds: 5
+          failureThreshold: 2
         env:
         - name: POD_IP
           valueFrom: