diff --git a/src/CodeCasa.AutomationPipelines.Lights/Pipeline/CompositeLightTransitionPipelineConfigurator.Switch.cs b/src/CodeCasa.AutomationPipelines.Lights/Pipeline/CompositeLightTransitionPipelineConfigurator.Switch.cs
index 017fecf..1a810ea 100644
--- a/src/CodeCasa.AutomationPipelines.Lights/Pipeline/CompositeLightTransitionPipelineConfigurator.Switch.cs
+++ b/src/CodeCasa.AutomationPipelines.Lights/Pipeline/CompositeLightTransitionPipelineConfigurator.Switch.cs
@@ -108,7 +108,7 @@ public ILightTransitionPipelineConfigurator<TLight> AddReactiveNodeSwitch<TObser
         if (instantiationScope == InstantiationScope.Shared)
         {
             var observable = ActivatorUtilities.CreateInstance<TObservable>(serviceProvider);
-            return AddReactiveNodeSwitch(observable, trueConfigure, falseConfigure);
+            return AddReactiveNodeSwitch(observable, trueConfigure, falseConfigure, instantiationScope);
         }
         NodeContainers.Values.ForEach(b => b.AddReactiveNodeSwitch<TObservable>(trueConfigure, falseConfigure, instantiationScope));
         return this;
@@ -129,7 +129,7 @@ public ILightTransitionPipelineConfigurator<TLight> AddPipelineSwitch<TObservabl
         if (instantiationScope == InstantiationScope.Shared)
         {
             var observable = ActivatorUtilities.CreateInstance<TObservable>(serviceProvider);
-            return AddPipelineSwitch(observable, trueConfigure, falseConfigure);
+            return AddPipelineSwitch(observable, trueConfigure, falseConfigure, instantiationScope);
         }
         NodeContainers.Values.ForEach(b => b.AddPipelineSwitch<TObservable>(trueConfigure, falseConfigure, instantiationScope));
         return this;
diff --git a/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/CompositeLightTransitionReactiveNodeConfigurator.On.cs b/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/CompositeLightTransitionReactiveNodeConfigurator.On.cs
index 8139853..ae51f8a 100644
--- a/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/CompositeLightTransitionReactiveNodeConfigurator.On.cs
+++ b/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/CompositeLightTransitionReactiveNodeConfigurator.On.cs
@@ -51,7 +51,7 @@ public ILightTransitionReactiveNodeConfigurator<TLight> On<T>(IObservable<T> tri
             return this;
         }
 
-        configurators.Values.ForEach(c => c.On(triggerObservable, pipelineConfigurator));
+        configurators.Values.ForEach(c => c.On(triggerObservable, pipelineConfigurator, instantiationScope));
         return this;
     }
 
@@ -67,7 +67,7 @@ public ILightTransitionReactiveNodeConfigurator<TLight> On<T>(IObservable<T> tri
             return this;
         }
 
-        configurators.Values.ForEach(c => c.On(triggerObservable, configure));
+        configurators.Values.ForEach(c => c.On(triggerObservable, configure, instantiationScope));
         return this;
     }