diff --git a/dotnet/src/Microsoft.Agents.AI.Workflows/HandoffWorkflowBuilder.cs b/dotnet/src/Microsoft.Agents.AI.Workflows/HandoffWorkflowBuilder.cs
index b443b07ff5..30ec899edc 100644
--- a/dotnet/src/Microsoft.Agents.AI.Workflows/HandoffWorkflowBuilder.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Workflows/HandoffWorkflowBuilder.cs
@@ -627,6 +627,7 @@ public class HandoffWorkflowBuilderCore<TBuilder> : OrchestrationBuilderBase<TBu
             agentMap[agent] = executors[agent.Id];
         }
 
+        this.ApplyMetadata(builder);
         this.ApplyOutputDesignations(builder, agentMap, "handoff", () =>
         {
             // Defaults (matches Python's Handoff orchestration):
diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/GroupChatWorkflowBuilderTests.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/GroupChatWorkflowBuilderTests.cs
index 02cd9907a5..1eb2d32434 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/GroupChatWorkflowBuilderTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/GroupChatWorkflowBuilderTests.cs
@@ -268,7 +268,7 @@ public class GroupChatWorkflowBuilderTests
             .Build();
 
         const string UserInput = "hello";
-        (_, List<ChatMessage>? result, _, _) = await AgentWorkflowBuilderTests.RunWorkflowAsync(workflow, [new ChatMessage(ChatRole.User, UserInput)]);
+        (_, List<ChatMessage>? result, _, _) = await OrchestrationTestHelpers.RunWorkflowAsync(workflow, [new ChatMessage(ChatRole.User, UserInput)]);
 
         Assert.NotNull(result);
         Assert.Equal(5, result.Count); // initial user input + 4 agent turns
@@ -314,7 +314,7 @@ public class GroupChatWorkflowBuilderTests
             .Build();
 
         const string UserInput = "hello";
-        await AgentWorkflowBuilderTests.RunWorkflowAsync(workflow, [new ChatMessage(ChatRole.User, UserInput)]);
+        await OrchestrationTestHelpers.RunWorkflowAsync(workflow, [new ChatMessage(ChatRole.User, UserInput)]);
 
         // Turn 1: agentA's buffer contains only the initial broadcast, which UpdateHistoryAsync
         // prefixed.