diff --git a/crates/bevy_pbr/src/lib.rs b/crates/bevy_pbr/src/lib.rs
index 01c0897410166..4629af9905159 100644
--- a/crates/bevy_pbr/src/lib.rs
+++ b/crates/bevy_pbr/src/lib.rs
@@ -376,6 +376,7 @@ impl Plugin for PbrPlugin {
                     extract_clusters_for_cpu_clustering
                         .run_if(not(gpu_clustering_is_enabled_during_extraction)),
                     extract_clusters_for_gpu_clustering
+                        .into_configs()
                         .run_if(gpu_clustering_is_enabled_during_extraction),
                 ),
             )
diff --git a/crates/bevy_render/src/render_phase/mod.rs b/crates/bevy_render/src/render_phase/mod.rs
index c468fa9978aa6..9f27f9377fd40 100644
--- a/crates/bevy_render/src/render_phase/mod.rs
+++ b/crates/bevy_render/src/render_phase/mod.rs
@@ -1640,8 +1640,10 @@ where
                     batching::sort_binned_render_phase::<BPI>.in_set(RenderSystems::PhaseSort),
                     (
                         no_gpu_preprocessing::batch_and_prepare_binned_render_phase::<BPI, GFBD>
+                            .into_configs()
                             .run_if(resource_exists::<BatchedInstanceBuffer<GFBD::BufferData>>),
                         gpu_preprocessing::batch_and_prepare_binned_render_phase::<BPI, GFBD>
+                            .into_configs()
                             .run_if(
                                 resource_exists::<
                                     BatchedInstanceBuffers<GFBD::BufferData, GFBD::BufferInputData>,
@@ -1651,6 +1653,7 @@ where
                         .in_set(RenderSystems::PrepareResourcesBatchPhases)
                         .ambiguous_with(RenderSystems::PrepareResourcesBatchPhases),
                     gpu_preprocessing::write_binned_instance_buffers::<BPI, GFBD>
+                        .into_configs()
                         .run_if(
                             resource_exists::<
                                 BatchedInstanceBuffers<GFBD::BufferData, GFBD::BufferInputData>,
@@ -1659,6 +1662,7 @@ where
                         .in_set(RenderSystems::PrepareResourcesWritePhaseBuffers)
                         .ambiguous_with(RenderSystems::PrepareResourcesWritePhaseBuffers),
                     gpu_preprocessing::collect_buffers_for_phase::<BPI, GFBD>
+                        .into_configs()
                         .run_if(
                             resource_exists::<
                                 BatchedInstanceBuffers<GFBD::BufferData, GFBD::BufferInputData>,
@@ -1760,8 +1764,10 @@ where
                 (
                     (
                         no_gpu_preprocessing::batch_and_prepare_sorted_render_phase::<SPI, GFBD>
+                            .into_configs()
                             .run_if(resource_exists::<BatchedInstanceBuffer<GFBD::BufferData>>),
                         gpu_preprocessing::batch_and_prepare_sorted_render_phase::<SPI, GFBD>
+                            .into_configs()
                             .run_if(
                                 resource_exists::<
                                     BatchedInstanceBuffers<GFBD::BufferData, GFBD::BufferInputData>,
@@ -1770,6 +1776,7 @@ where
                     )
                         .in_set(RenderSystems::PrepareResourcesBatchPhases),
                     gpu_preprocessing::collect_buffers_for_phase::<SPI, GFBD>
+                        .into_configs()
                         .run_if(
                             resource_exists::<
                                 BatchedInstanceBuffers<GFBD::BufferData, GFBD::BufferInputData>,
diff --git a/crates/bevy_render/src/view/window/mod.rs b/crates/bevy_render/src/view/window/mod.rs
index a8efdc74741cf..ebb615317c52a 100644
--- a/crates/bevy_render/src/view/window/mod.rs
+++ b/crates/bevy_render/src/view/window/mod.rs
@@ -55,6 +55,7 @@ impl Plugin for WindowRenderPlugin {
                 .add_systems(
                     Render,
                     create_surfaces
+                        .into_configs()
                         .run_if(need_surface_configuration)
                         .before(prepare_windows),
                 )