diff --git a/workflow_builder/argo_builder.go b/workflow_builder/argo_builder.go
index b536160..3893d76 100644
--- a/workflow_builder/argo_builder.go
+++ b/workflow_builder/argo_builder.go
@@ -433,8 +433,8 @@ func (b *ArgoBuilder) CompleteBuild(executionsId string) (string, error) {
 	// Update the name of the admiralty node to use 
 	for _, template := range b.Workflow.Spec.Templates {
 		if len(template.Metadata.Annotations) > 0 {
-			if _, ok := template.Metadata.Annotations["multicluster.admiralty.io/clustername"]; ok {
-				template.Metadata.Annotations["multicluster.admiralty.io/clustername"] = "target-" + conf.GetConfig().ExecutionID
+			if peerId, ok := template.Metadata.Annotations["multicluster.admiralty.io/clustername"]; ok {
+				template.Metadata.Annotations["multicluster.admiralty.io/clustername"] = "target-" + peerId + "-" + conf.GetConfig().ExecutionID
 			}
 		}
 	}