diff --git a/automation/service/service.go b/automation/service/service.go
index 59fcb3564..0d940a195 100644
--- a/automation/service/service.go
+++ b/automation/service/service.go
@@ -92,7 +92,7 @@ func Initialize(ctx context.Context, log *zap.Logger, s store.Storer, ws websock
 	DefaultAccessControl = AccessControl()
 
 	DefaultSession = Session(DefaultLogger.Named("session"), c.Workflow, ws)
-	DefaultWorkflow = Workflow(DefaultLogger.Named("workflow"), c.Corredor)
+	DefaultWorkflow = Workflow(DefaultLogger.Named("workflow"), c.Corredor, c.Workflow)
 	DefaultTrigger = Trigger(DefaultLogger.Named("trigger"), c.Workflow)
 
 	DefaultWorkflow.triggers = DefaultTrigger
diff --git a/pkg/apigw/registry/registry.go b/pkg/apigw/registry/registry.go
index fd59c3899..d712cd12b 100644
--- a/pkg/apigw/registry/registry.go
+++ b/pkg/apigw/registry/registry.go
@@ -73,5 +73,7 @@ func (r *Registry) Preload() {
 }
 
 func NewWorkflow() (wf filter.WfExecer) {
-	return service.Workflow(&zap.Logger{}, options.CorredorOpt{})
+	// implementation assumes that Corredor & Workflow options can not be changed
+	// in the run-time.
+	return service.Workflow(&zap.Logger{}, *options.Corredor(), *options.Workflow())
 }