diff --git a/Cargo.toml b/Cargo.toml
index 105bdd4..1d1f5a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,11 +15,11 @@ homepage = "https://github.com/zkat/big-brain"
 [workspace]
 
 [dependencies]
-bevy = { version = "0.16.0", default-features = false, features = ["bevy_log"] }
+bevy = { version = "0.17.0", default-features = false, features = ["bevy_log"] }
 big-brain-derive = { version = "=0.23.0", path = "./derive" }
 
 [dev-dependencies]
-bevy = { version = "0.16.0", default-features = true }
+bevy = { version = "0.17.0", default-features = true }
 rand = { version = "0.8.5", features = ["small_rng"] }
 
 [features]
diff --git a/examples/farming_sim.rs b/examples/farming_sim.rs
index 17eec1a..d9eb586 100644
--- a/examples/farming_sim.rs
+++ b/examples/farming_sim.rs
@@ -585,7 +585,7 @@ fn init_entities(
 // ================================================================================
 
 // Define a custom event for our scene loading
-#[derive(Event)]
+#[derive(Event, Message)]
 struct SceneLoaded {
     /// The entities in this scene
     entities: Vec<Entity>,
@@ -624,12 +624,13 @@ fn main() {
             // farming_sim --features=trace` to see extra tracing output.
             filter: "big_brain=debug,farming_sim=debug".to_string(),
             custom_layer: |_| None,
+            ..default()
         }))
-        .add_event::<SceneLoaded>()
+        .add_message::<SceneLoaded>()
         .add_systems(Update, check_scene_loaded)
         // This observer will attach components to entities in the scene based on their names.
         .add_observer(
-            |trigger: Trigger<SceneLoaded>,
+            |trigger: On<SceneLoaded>,
              query: Query<(Entity, &Name)>,
              mut commands: Commands| {
                 for entity in trigger.event().entities.iter() {
diff --git a/tests/steps.rs b/tests/steps.rs
index 24ed18a..b066556 100644
--- a/tests/steps.rs
+++ b/tests/steps.rs
@@ -62,7 +62,7 @@ struct ExitAction;
 
 fn exit_action(
     mut query: Query<(&Actor, &mut ActionState), With<ExitAction>>,
-    mut app_exit_events: EventWriter<AppExit>,
+    mut app_exit_events: MessageWriter<AppExit>,
 ) {
     for (Actor(_actor), mut state) in query.iter_mut() {
         println!("exit_action {state:?}");