diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76048f5..1ba3838 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.8.0
+
+### Changes
+- Support for Bevy 0.18!
+
 # 0.7.0
 
 ### Changes
diff --git a/Cargo.toml b/Cargo.toml
index 671b4a1..2d07498 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,11 +9,11 @@ members = [
 exclude = [".direnv/", ".vscode/", "Cargo.lock", "*.nix", "flake.lock", ".envrc", ".github/"]
 
 [workspace.dependencies]
-bevy_app = { version = "0.17.0", default-features = false }
-bevy_ecs = { version = "0.17.0", default-features = false }
-bevy_log = { version = "0.17.0", default-features = false }
-bevy_state = { version = "0.17.0", default-features = false, features = ["bevy_app"] }
-bevy = { version = "0.17.0", default-features = false, features = ["bevy_log", "bevy_state"] }
+bevy_app = { version = "0.18.1", default-features = false }
+bevy_ecs = { version = "0.18.1", default-features = false }
+bevy_log = { version = "0.18.1", default-features = false }
+bevy_state = { version = "0.18.1", default-features = false, features = ["bevy_app"] }
+bevy = { version = "0.18.1", default-features = false, features = ["bevy_log", "bevy_state"] }
 deluxe = { version = "0.5.0", path = "deluxe-vendored" }
 deluxe-core = { version = "0.5.0", path = "deluxe-vendored/core" }
 proc-macro2 = "1.0.93"
diff --git a/README.md b/README.md
index 4c6ce77..15ec82b 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ A set of procedural macros for making Bevy plugins and systems more self-documen
 ## Version Compatibility
 | bevy | bevy-butler |
 |------|-------------|
+|`0.18`|   `0.8`     |
 |`0.17`|   `0.7`     |
 |`0.16`|   `0.6`     |
 |`0.15`|   `0.5`     |
diff --git a/bevy-butler-proc-macro/Cargo.toml b/bevy-butler-proc-macro/Cargo.toml
index 9a90047..1b37db6 100644
--- a/bevy-butler-proc-macro/Cargo.toml
+++ b/bevy-butler-proc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy-butler-proc-macro"
-version = "0.7.0"
+version = "0.8.0"
 edition = "2021"
 description = "Procedural macro definitions for bevy-butler"
 license = "MIT OR Apache-2.0"
diff --git a/bevy-butler/Cargo.toml b/bevy-butler/Cargo.toml
index 8262abf..d7f5735 100644
--- a/bevy-butler/Cargo.toml
+++ b/bevy-butler/Cargo.toml
@@ -1,17 +1,17 @@
 [package]
 name = "bevy-butler"
-version = "0.7.0"
+version = "0.8.0"
 edition = "2021"
 categories = ["game-development", "rust-patterns"]
 description = "A crate for making Bevy systems more self-documenting"
 keywords = ["game", "gamedev", "bevy", "systems", "macro"]
-rust-version = "1.88.0" # Follows bevy 0.17
+rust-version = "1.88.0" # Follows bevy 0.18
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/DragonFoxCollective/bevy-butler" # :)
 exclude = [".direnv/", ".vscode/", "Cargo.lock", "*.nix", "flake.lock", ".envrc", ".github/"]
 
 [dependencies]
-bevy-butler-proc-macro = { path = "../bevy-butler-proc-macro", version = "0.7.0" }
+bevy-butler-proc-macro = { path = "../bevy-butler-proc-macro", version = "0.8.0" }
 bevy_app = { workspace = true }
 bevy_ecs = { workspace = true }
 bevy_log = { workspace = true }
diff --git a/bevy-butler/src/lib.rs b/bevy-butler/src/lib.rs
index 5aff330..6490792 100644
--- a/bevy-butler/src/lib.rs
+++ b/bevy-butler/src/lib.rs
@@ -162,7 +162,7 @@ pub use bevy_butler_proc_macro::add_system;
 /// #     content: String,
 /// # }
 /// #[add_observer(plugin = MyPlugin)]
-/// fn receive_message(message: Trigger<Message>) {
+/// fn receive_message(message: On<Message>) {
 ///     info!("Message received: {}", message.content);
 /// }
 /// ```
@@ -181,7 +181,7 @@ pub use bevy_butler_proc_macro::add_system;
 /// #       content: String,
 /// #   }
 /// #
-/// #   pub(super) fn receive_message(message: Trigger<Message>) {
+/// #   pub(super) fn receive_message(message: On<Message>) {
 /// #       info!("Message received: {}", message.content);
 /// #   }
 /// # }