diff --git a/pkg/capabilities/v2/actions/confidentialhttp/server/client_server_gen.go b/pkg/capabilities/v2/actions/confidentialhttp/server/client_server_gen.go
index b19275d87..6439b9e03 100644
--- a/pkg/capabilities/v2/actions/confidentialhttp/server/client_server_gen.go
+++ b/pkg/capabilities/v2/actions/confidentialhttp/server/client_server_gen.go
@@ -121,6 +121,7 @@ func (c *clientCapability) UnregisterFromWorkflow(ctx context.Context, request c
 
 func (c *clientCapability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 	response := capabilities.CapabilityResponse{}
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "SendRequest":
 		input := &confidentialhttp.ConfidentialHTTPRequest{}
diff --git a/pkg/capabilities/v2/actions/confidentialworkflow/server/client_server_gen.go b/pkg/capabilities/v2/actions/confidentialworkflow/server/client_server_gen.go
index c98f8a5dc..0a8593ee3 100644
--- a/pkg/capabilities/v2/actions/confidentialworkflow/server/client_server_gen.go
+++ b/pkg/capabilities/v2/actions/confidentialworkflow/server/client_server_gen.go
@@ -121,6 +121,7 @@ func (c *clientCapability) UnregisterFromWorkflow(ctx context.Context, request c
 
 func (c *clientCapability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 	response := capabilities.CapabilityResponse{}
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "Execute":
 		input := &confidentialworkflow.ConfidentialWorkflowRequest{}
diff --git a/pkg/capabilities/v2/actions/http/server/client_server_gen.go b/pkg/capabilities/v2/actions/http/server/client_server_gen.go
index d57d145eb..ac195c54e 100644
--- a/pkg/capabilities/v2/actions/http/server/client_server_gen.go
+++ b/pkg/capabilities/v2/actions/http/server/client_server_gen.go
@@ -121,6 +121,7 @@ func (c *clientCapability) UnregisterFromWorkflow(ctx context.Context, request c
 
 func (c *clientCapability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 	response := capabilities.CapabilityResponse{}
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "SendRequest":
 		input := &http.Request{}
diff --git a/pkg/capabilities/v2/chain-capabilities/aptos/server/client_server_gen.go b/pkg/capabilities/v2/chain-capabilities/aptos/server/client_server_gen.go
index 9292bd029..8417eeeee 100644
--- a/pkg/capabilities/v2/chain-capabilities/aptos/server/client_server_gen.go
+++ b/pkg/capabilities/v2/chain-capabilities/aptos/server/client_server_gen.go
@@ -132,6 +132,7 @@ func (c *clientCapability) UnregisterFromWorkflow(ctx context.Context, request c
 
 func (c *clientCapability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 	response := capabilities.CapabilityResponse{}
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "AccountAPTBalance":
 		input := &aptos.AccountAPTBalanceRequest{}
diff --git a/pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go b/pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go
index 9c972301e..889900a11 100644
--- a/pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go
+++ b/pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go
@@ -121,6 +121,7 @@ var _ capabilities.ExecutableAndTriggerCapability = (*clientCapability)(nil)
 const ClientID = "evm@1.0.0"
 
 func (c *clientCapability) RegisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) (<-chan capabilities.TriggerResponse, error) {
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "LogTrigger":
 		input := &evm.FilterLogTriggerRequest{}
@@ -131,6 +132,7 @@ func (c *clientCapability) RegisterTrigger(ctx context.Context, request capabili
 }
 
 func (c *clientCapability) UnregisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) error {
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "LogTrigger":
 		input := &evm.FilterLogTriggerRequest{}
@@ -163,6 +165,7 @@ func (c *clientCapability) UnregisterFromWorkflow(ctx context.Context, request c
 
 func (c *clientCapability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 	response := capabilities.CapabilityResponse{}
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "CallContract":
 		input := &evm.CallContractRequest{}
diff --git a/pkg/capabilities/v2/chain-capabilities/solana/server/client_server_gen.go b/pkg/capabilities/v2/chain-capabilities/solana/server/client_server_gen.go
index 82b9b7ea7..fd0ec54c0 100644
--- a/pkg/capabilities/v2/chain-capabilities/solana/server/client_server_gen.go
+++ b/pkg/capabilities/v2/chain-capabilities/solana/server/client_server_gen.go
@@ -123,6 +123,7 @@ var _ capabilities.ExecutableAndTriggerCapability = (*clientCapability)(nil)
 const ClientID = "solana@1.0.0"
 
 func (c *clientCapability) RegisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) (<-chan capabilities.TriggerResponse, error) {
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "LogTrigger":
 		input := &solana.FilterLogTriggerRequest{}
@@ -133,6 +134,7 @@ func (c *clientCapability) RegisterTrigger(ctx context.Context, request capabili
 }
 
 func (c *clientCapability) UnregisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) error {
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "LogTrigger":
 		input := &solana.FilterLogTriggerRequest{}
@@ -165,6 +167,7 @@ func (c *clientCapability) UnregisterFromWorkflow(ctx context.Context, request c
 
 func (c *clientCapability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 	response := capabilities.CapabilityResponse{}
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "GetAccountInfoWithOpts":
 		input := &solana.GetAccountInfoWithOptsRequest{}
diff --git a/pkg/capabilities/v2/consensus/server/consensus_server_gen.go b/pkg/capabilities/v2/consensus/server/consensus_server_gen.go
index b772944bc..f18957512 100644
--- a/pkg/capabilities/v2/consensus/server/consensus_server_gen.go
+++ b/pkg/capabilities/v2/consensus/server/consensus_server_gen.go
@@ -124,6 +124,7 @@ func (c *consensusCapability) UnregisterFromWorkflow(ctx context.Context, reques
 
 func (c *consensusCapability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 	response := capabilities.CapabilityResponse{}
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "Simple":
 		input := &sdk.SimpleConsensusInputs{}
diff --git a/pkg/capabilities/v2/protoc/pkg/templates/server.go.tmpl b/pkg/capabilities/v2/protoc/pkg/templates/server.go.tmpl
index 058d41034..0985de3a6 100644
--- a/pkg/capabilities/v2/protoc/pkg/templates/server.go.tmpl
+++ b/pkg/capabilities/v2/protoc/pkg/templates/server.go.tmpl
@@ -135,6 +135,7 @@ const {{.GoName}}ID = "{{CapabilityId $service}}"
 
 func (c *{{.GoName|LowerFirst}}Capability) RegisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) (<-chan capabilities.TriggerResponse, error) {
 {{- if $hasTriggers }}
+    ctx = request.Metadata.ContextWithCRE(ctx)
     switch request.Method {
         {{- range .Methods}}
         {{- if (isTrigger .) }}
@@ -153,6 +154,7 @@ func (c *{{.GoName|LowerFirst}}Capability) RegisterTrigger(ctx context.Context,
 
 func (c *{{.GoName|LowerFirst}}Capability) UnregisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) error {
 {{- if $hasTriggers	  }}
+        ctx = request.Metadata.ContextWithCRE(ctx)
 	    switch request.Method {
             {{- range .Methods}}
             {{- if (isTrigger .) }}
@@ -201,6 +203,7 @@ func (c *{{.GoName|LowerFirst}}Capability) UnregisterFromWorkflow(ctx context.Co
 func (c *{{.GoName|LowerFirst}}Capability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 {{- if $hasActions }}
     response := capabilities.CapabilityResponse{}
+    ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
     {{- range .Methods}}
     {{- if  not (isTrigger .) }}
diff --git a/pkg/capabilities/v2/protoc/pkg/test_capabilities/actionandtrigger/server/action_and_trigger_server_gen.go b/pkg/capabilities/v2/protoc/pkg/test_capabilities/actionandtrigger/server/action_and_trigger_server_gen.go
index 89a6d1461..6b443187e 100644
--- a/pkg/capabilities/v2/protoc/pkg/test_capabilities/actionandtrigger/server/action_and_trigger_server_gen.go
+++ b/pkg/capabilities/v2/protoc/pkg/test_capabilities/actionandtrigger/server/action_and_trigger_server_gen.go
@@ -104,6 +104,7 @@ var _ capabilities.ExecutableAndTriggerCapability = (*basicCapability)(nil)
 const BasicID = "basic-test-action-trigger@1.0.0"
 
 func (c *basicCapability) RegisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) (<-chan capabilities.TriggerResponse, error) {
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "Trigger":
 		input := &actionandtrigger.Config{}
@@ -114,6 +115,7 @@ func (c *basicCapability) RegisterTrigger(ctx context.Context, request capabilit
 }
 
 func (c *basicCapability) UnregisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) error {
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "Trigger":
 		input := &actionandtrigger.Config{}
@@ -146,6 +148,7 @@ func (c *basicCapability) UnregisterFromWorkflow(ctx context.Context, request ca
 
 func (c *basicCapability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 	response := capabilities.CapabilityResponse{}
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "Action":
 		input := &actionandtrigger.Input{}
diff --git a/pkg/capabilities/v2/protoc/pkg/test_capabilities/basicaction/server/basic_action_server_gen.go b/pkg/capabilities/v2/protoc/pkg/test_capabilities/basicaction/server/basic_action_server_gen.go
index 157d0bae1..3bca14cd3 100644
--- a/pkg/capabilities/v2/protoc/pkg/test_capabilities/basicaction/server/basic_action_server_gen.go
+++ b/pkg/capabilities/v2/protoc/pkg/test_capabilities/basicaction/server/basic_action_server_gen.go
@@ -121,6 +121,7 @@ func (c *basicActionCapability) UnregisterFromWorkflow(ctx context.Context, requ
 
 func (c *basicActionCapability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 	response := capabilities.CapabilityResponse{}
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "PerformAction":
 		input := &basicaction.Inputs{}
diff --git a/pkg/capabilities/v2/protoc/pkg/test_capabilities/basictrigger/server/basic_trigger_server_gen.go b/pkg/capabilities/v2/protoc/pkg/test_capabilities/basictrigger/server/basic_trigger_server_gen.go
index b6019f431..d265dbd62 100644
--- a/pkg/capabilities/v2/protoc/pkg/test_capabilities/basictrigger/server/basic_trigger_server_gen.go
+++ b/pkg/capabilities/v2/protoc/pkg/test_capabilities/basictrigger/server/basic_trigger_server_gen.go
@@ -102,6 +102,7 @@ var _ capabilities.ExecutableAndTriggerCapability = (*basicCapability)(nil)
 const BasicID = "basic-test-trigger@1.0.0"
 
 func (c *basicCapability) RegisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) (<-chan capabilities.TriggerResponse, error) {
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "Trigger":
 		input := &basictrigger.Config{}
@@ -112,6 +113,7 @@ func (c *basicCapability) RegisterTrigger(ctx context.Context, request capabilit
 }
 
 func (c *basicCapability) UnregisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) error {
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "Trigger":
 		input := &basictrigger.Config{}
diff --git a/pkg/capabilities/v2/protoc/pkg/test_capabilities/consensus/server/consensus_server_gen.go b/pkg/capabilities/v2/protoc/pkg/test_capabilities/consensus/server/consensus_server_gen.go
index b772944bc..f18957512 100644
--- a/pkg/capabilities/v2/protoc/pkg/test_capabilities/consensus/server/consensus_server_gen.go
+++ b/pkg/capabilities/v2/protoc/pkg/test_capabilities/consensus/server/consensus_server_gen.go
@@ -124,6 +124,7 @@ func (c *consensusCapability) UnregisterFromWorkflow(ctx context.Context, reques
 
 func (c *consensusCapability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 	response := capabilities.CapabilityResponse{}
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "Simple":
 		input := &sdk.SimpleConsensusInputs{}
diff --git a/pkg/capabilities/v2/protoc/pkg/test_capabilities/importclash/server/clash_server_gen.go b/pkg/capabilities/v2/protoc/pkg/test_capabilities/importclash/server/clash_server_gen.go
index dc8460049..18d658af5 100644
--- a/pkg/capabilities/v2/protoc/pkg/test_capabilities/importclash/server/clash_server_gen.go
+++ b/pkg/capabilities/v2/protoc/pkg/test_capabilities/importclash/server/clash_server_gen.go
@@ -122,6 +122,7 @@ func (c *basicActionCapability) UnregisterFromWorkflow(ctx context.Context, requ
 
 func (c *basicActionCapability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 	response := capabilities.CapabilityResponse{}
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "PerformAction":
 		input := &p1.Item{}
diff --git a/pkg/capabilities/v2/protoc/pkg/test_capabilities/nodeaction/server/node_action_server_gen.go b/pkg/capabilities/v2/protoc/pkg/test_capabilities/nodeaction/server/node_action_server_gen.go
index 9a8c9cd54..1e8d2db4e 100644
--- a/pkg/capabilities/v2/protoc/pkg/test_capabilities/nodeaction/server/node_action_server_gen.go
+++ b/pkg/capabilities/v2/protoc/pkg/test_capabilities/nodeaction/server/node_action_server_gen.go
@@ -121,6 +121,7 @@ func (c *basicActionCapability) UnregisterFromWorkflow(ctx context.Context, requ
 
 func (c *basicActionCapability) Execute(ctx context.Context, request capabilities.CapabilityRequest) (capabilities.CapabilityResponse, error) {
 	response := capabilities.CapabilityResponse{}
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "PerformAction":
 		input := &nodeaction.NodeInputs{}
diff --git a/pkg/capabilities/v2/triggers/cron/server/trigger_server_gen.go b/pkg/capabilities/v2/triggers/cron/server/trigger_server_gen.go
index 9e1c39753..0b1b48d29 100644
--- a/pkg/capabilities/v2/triggers/cron/server/trigger_server_gen.go
+++ b/pkg/capabilities/v2/triggers/cron/server/trigger_server_gen.go
@@ -105,6 +105,7 @@ var _ capabilities.ExecutableAndTriggerCapability = (*cronCapability)(nil)
 const CronID = "cron-trigger@1.0.0"
 
 func (c *cronCapability) RegisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) (<-chan capabilities.TriggerResponse, error) {
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "Trigger":
 		input := &cron.Config{}
@@ -118,6 +119,7 @@ func (c *cronCapability) RegisterTrigger(ctx context.Context, request capabiliti
 }
 
 func (c *cronCapability) UnregisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) error {
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "Trigger":
 		input := &cron.Config{}
diff --git a/pkg/capabilities/v2/triggers/http/server/trigger_server_gen.go b/pkg/capabilities/v2/triggers/http/server/trigger_server_gen.go
index 369295d21..373dbe7a3 100644
--- a/pkg/capabilities/v2/triggers/http/server/trigger_server_gen.go
+++ b/pkg/capabilities/v2/triggers/http/server/trigger_server_gen.go
@@ -102,6 +102,7 @@ var _ capabilities.ExecutableAndTriggerCapability = (*hTTPCapability)(nil)
 const HTTPID = "http-trigger@1.0.0-alpha"
 
 func (c *hTTPCapability) RegisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) (<-chan capabilities.TriggerResponse, error) {
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "Trigger":
 		input := &http.Config{}
@@ -112,6 +113,7 @@ func (c *hTTPCapability) RegisterTrigger(ctx context.Context, request capabiliti
 }
 
 func (c *hTTPCapability) UnregisterTrigger(ctx context.Context, request capabilities.TriggerRegistrationRequest) error {
+	ctx = request.Metadata.ContextWithCRE(ctx)
 	switch request.Method {
 	case "Trigger":
 		input := &http.Config{}