diff --git a/crates/bevy_gizmos/src/lib.rs b/crates/bevy_gizmos/src/lib.rs
index 3d5a22a58986d9..f5f0ae1b623bba 100644
--- a/crates/bevy_gizmos/src/lib.rs
+++ b/crates/bevy_gizmos/src/lib.rs
@@ -31,7 +31,7 @@ pub mod prelude {
     pub use crate::{gizmos::Gizmos, AabbGizmo, AabbGizmoConfig, GizmoConfig};
 }
 
-use bevy_app::{FixedUpdate, Last, Plugin, PostUpdate, RunFixedUpdateLoop};
+use bevy_app::{FixedLast, Last, Plugin, PostUpdate, RunFixedMainLoop};
 use bevy_asset::{load_internal_asset, Asset, AssetApp, Assets, Handle};
 use bevy_core::cast_slice;
 use bevy_ecs::{
@@ -97,14 +97,14 @@ impl Plugin for GizmoPlugin {
                 (propagate_gizmos::<Fixed>, update_gizmo_meshes).chain(),
             )
             .add_systems(
-                RunFixedUpdateLoop,
+                RunFixedMainLoop,
                 (
-                    (store_default_gizmos,).before(bevy_time::run_fixed_update_schedule),
-                    (collect_default_gizmos::<Fixed>,).after(bevy_time::run_fixed_update_schedule),
+                    store_default_gizmos.before(bevy_time::run_fixed_main_schedule),
+                    collect_default_gizmos::<Fixed>.after(bevy_time::run_fixed_main_schedule),
                 ),
             )
             .add_systems(
-                FixedUpdate,
+                FixedLast,
                 (clear_gizmo_context::<Update>, clear_gizmo_context::<Fixed>),
             )
             .add_systems(