diff --git a/components/image-builder-mk3/pkg/orchestrator/orchestrator.go b/components/image-builder-mk3/pkg/orchestrator/orchestrator.go
index 39979fbb70bebd..1fc12c56250bdb 100644
--- a/components/image-builder-mk3/pkg/orchestrator/orchestrator.go
+++ b/components/image-builder-mk3/pkg/orchestrator/orchestrator.go
@@ -151,7 +151,9 @@ func (o *Orchestrator) ResolveBaseImage(ctx context.Context, req *protocol.Resol
 
 	reqs, _ := protojson.Marshal(req)
 	safeReqs, _ := log.RedactJSON(reqs)
-	log.WithField("req", string(safeReqs)).Debug("ResolveBaseImage")
+	safeReqsLog := make(map[string]interface{})
+	_ = json.Unmarshal(safeReqs, &safeReqsLog)
+	log.WithFields(safeReqsLog).Debug("ResolveBaseImage")
 
 	reqauth := o.AuthResolver.ResolveRequestAuth(req.Auth)
 
@@ -173,7 +175,9 @@ func (o *Orchestrator) ResolveWorkspaceImage(ctx context.Context, req *protocol.
 
 	reqs, _ := protojson.Marshal(req)
 	safeReqs, _ := log.RedactJSON(reqs)
-	log.WithField("req", string(safeReqs)).Debug("ResolveWorkspaceImage")
+	safeReqsLog := make(map[string]interface{})
+	_ = json.Unmarshal(safeReqs, &safeReqsLog)
+	log.WithFields(safeReqsLog).Debug("ResolveWorkspaceImage")
 
 	reqauth := o.AuthResolver.ResolveRequestAuth(req.Auth)
 	baseref, err := o.getBaseImageRef(ctx, req.Source, reqauth)
diff --git a/components/ws-manager/pkg/manager/manager.go b/components/ws-manager/pkg/manager/manager.go
index 716027f608d7d2..e8f3408c57f274 100644
--- a/components/ws-manager/pkg/manager/manager.go
+++ b/components/ws-manager/pkg/manager/manager.go
@@ -206,7 +206,9 @@ func (m *Manager) StartWorkspace(ctx context.Context, req *api.StartWorkspaceReq
 	clog.Info("StartWorkspace")
 	reqs, _ := protojson.Marshal(req)
 	safeReqs, _ := log.RedactJSON(reqs)
-	clog.WithField("req", string(safeReqs)).Debug("StartWorkspace request received")
+	safeReqsLog := make(map[string]interface{})
+	_ = json.Unmarshal(safeReqs, &safeReqsLog)
+	clog.WithFields(safeReqsLog).Debug("StartWorkspace request received")
 
 	// Make sure the objects we're about to create do not exist already
 	switch req.Type {
@@ -1386,12 +1388,16 @@ func (m *Manager) onChange(ctx context.Context, status *api.WorkspaceStatus) {
 	if status.Conditions.Failed != "" {
 		status, _ := protojson.Marshal(status)
 		safeStatus, _ := log.RedactJSON(status)
-		clog.WithField("status", string(safeStatus)).Error("workspace failed")
+		safeStatusLog := make(map[string]interface{})
+		_ = json.Unmarshal(safeStatus, &safeStatusLog)
+		clog.WithFields(safeStatusLog).Error("workspace failed")
 	}
 	if status.Phase == 0 {
 		status, _ := protojson.Marshal(status)
 		safeStatus, _ := log.RedactJSON(status)
-		clog.WithField("status", string(safeStatus)).Error("workspace in UNKNOWN phase")
+		safeStatusLog := make(map[string]interface{})
+		_ = json.Unmarshal(safeStatus, &safeStatusLog)
+		clog.WithFields(safeStatusLog).Error("workspace in UNKNOWN phase")
 	}
 }