diff --git a/cmd/tcl/testworkflow-toolkit/commands/services.go b/cmd/tcl/testworkflow-toolkit/commands/services.go
index 78b4d88a6c..a27605cd2b 100644
--- a/cmd/tcl/testworkflow-toolkit/commands/services.go
+++ b/cmd/tcl/testworkflow-toolkit/commands/services.go
@@ -269,6 +269,7 @@ func NewServicesCmd() *cobra.Command {
 				scheduledAt := time.Now()
 				result, err := spawn.ExecutionWorker().Service(context.Background(), executionworkertypes.ServiceRequest{
 					ResourceId:     cfg.Resource.Id,
+					GroupId:        groupRef,
 					Execution:      cfg.Execution,
 					Workflow:       testworkflowsv1.TestWorkflow{Spec: instance.Spec},
 					ScheduledAt:    &scheduledAt,
diff --git a/cmd/testworkflow-init/main.go b/cmd/testworkflow-init/main.go
index 91a3b8ab72..74300096c1 100644
--- a/cmd/testworkflow-init/main.go
+++ b/cmd/testworkflow-init/main.go
@@ -240,6 +240,10 @@ func main() {
 			}
 
 		case lite.ActionTypeExecute:
+			// Ensure the latest state before each execute,
+			// as it may refer to the state file (Toolkit).
+			data.SaveState()
+
 			// Ignore running when the step is already resolved (= skipped)
 			step := state.GetStep(action.Execute.Ref)
 			if step.IsFinished() {