diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82e97cdfd..1c152dc0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+# [2.5.0](https://github.com/hirosystems/clarinet/compare/v2.4.1...v2.5.0) (2024-04-15)
+
+##### New Features
+
+*  Improved epoch 2.5 support (#1418) (397d8a49)
+*  Enable boot contracts coverage (#1412) (c5709640)
+*  Introduce the stacks-codec component (#1399) (83e13831)
+
+##### Chores
+
+*  Update dependencies (#1415) (38824a8b)
+*  Update pox-4.clar (#1409) (a5b3ffbd)
+
+##### Bug Fixes
+
+*  Improve error message in sdk custom matchers (#1417) (a7bd0738)
+*  Allow epoch 2.5 in clarinet-sdk (#1414) (19747e38)
+
 # [2.4.1](https://github.com/hirosystems/clarinet/compare/v2.4.0...v2.4.1) (2024-03-25)
 
 ##### Fix
diff --git a/Cargo.lock b/Cargo.lock
index 419464cfc..911ba179e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -697,7 +697,7 @@ dependencies = [
  "serde-hex",
  "serde_derive",
  "serde_json",
- "stacks-codec 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stacks-codec 2.4.1",
  "threadpool",
  "tokio",
 ]
@@ -806,7 +806,7 @@ dependencies = [
 
 [[package]]
 name = "clarinet-cli"
-version = "2.4.1"
+version = "2.5.0"
 dependencies = [
  "ansi_term",
  "atty",
@@ -865,7 +865,7 @@ dependencies = [
 
 [[package]]
 name = "clarinet-deployments"
-version = "2.4.1"
+version = "2.5.0"
 dependencies = [
  "base58 0.2.0",
  "base64 0.21.7",
@@ -882,14 +882,14 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "serde_yaml",
- "stacks-codec 2.4.1",
+ "stacks-codec 2.5.0",
  "stacks-rpc-client",
  "tiny-hderive",
 ]
 
 [[package]]
 name = "clarinet-files"
-version = "2.4.1"
+version = "2.5.0"
 dependencies = [
  "bip39",
  "bitcoin 0.29.2",
@@ -911,7 +911,7 @@ dependencies = [
 
 [[package]]
 name = "clarinet-sdk-wasm"
-version = "2.5.0-beta2"
+version = "2.5.0"
 dependencies = [
  "clarinet-deployments",
  "clarinet-files",
@@ -919,7 +919,6 @@ dependencies = [
  "colored 2.1.0",
  "console_error_panic_hook",
  "gloo-utils",
- "hashbrown 0.14.3",
  "js-sys",
  "serde",
  "serde-wasm-bindgen",
@@ -1017,7 +1016,7 @@ dependencies = [
 
 [[package]]
 name = "clarity-repl"
-version = "2.4.1"
+version = "2.5.0"
 dependencies = [
  "ansi_term",
  "atty",
@@ -4961,19 +4960,19 @@ dependencies = [
 [[package]]
 name = "stacks-codec"
 version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d5791855bf9de767f55042f1a034a2575373c6433b0965f1efac14e7215f71b"
 dependencies = [
- "clarity",
+ "clarity-vm",
  "serde",
  "wsts",
 ]
 
 [[package]]
 name = "stacks-codec"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5791855bf9de767f55042f1a034a2575373c6433b0965f1efac14e7215f71b"
+version = "2.5.0"
 dependencies = [
- "clarity-vm",
+ "clarity",
  "serde",
  "wsts",
 ]
@@ -5043,7 +5042,7 @@ dependencies = [
 
 [[package]]
 name = "stacks-devnet-js"
-version = "2.4.1"
+version = "2.5.0"
 dependencies = [
  "clarinet-deployments",
  "clarinet-files",
@@ -5059,7 +5058,7 @@ dependencies = [
 
 [[package]]
 name = "stacks-network"
-version = "2.4.1"
+version = "2.5.0"
 dependencies = [
  "ansi_term",
  "atty",
@@ -5087,7 +5086,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "serde_yaml",
- "stacks-codec 2.4.1",
+ "stacks-codec 2.5.0",
  "stacks-rpc-client",
  "stackslib",
  "tokio",
@@ -5098,7 +5097,7 @@ dependencies = [
 
 [[package]]
 name = "stacks-rpc-client"
-version = "2.4.1"
+version = "2.5.0"
 dependencies = [
  "hmac 0.12.1",
  "libsecp256k1 0.7.1",
@@ -5108,7 +5107,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "sha2 0.10.6",
- "stacks-codec 2.4.1",
+ "stacks-codec 2.5.0",
  "tiny-hderive",
 ]
 
diff --git a/components/clarinet-cli/Cargo.toml b/components/clarinet-cli/Cargo.toml
index de122c96d..3dfd4d721 100644
--- a/components/clarinet-cli/Cargo.toml
+++ b/components/clarinet-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "clarinet-cli"
-version = "2.4.1"
+version = "2.5.0"
 authors = ["Ludo Galabru <ludo@hiro.so>", "Brice Dobry <brice@hiro.so>"]
 edition = "2021"
 description = "Clarinet is a simple, modern and opinionated runtime for testing, integrating and deploying Clarity smart contracts."
diff --git a/components/clarinet-cli/src/generate/project.rs b/components/clarinet-cli/src/generate/project.rs
index cd130d8de..8d88684b2 100644
--- a/components/clarinet-cli/src/generate/project.rs
+++ b/components/clarinet-cli/src/generate/project.rs
@@ -414,21 +414,21 @@ disable_stacks_api = false
 
 # Send some stacking orders
 [[devnet.pox_stacking_orders]]
-start_at_cycle = 2
+start_at_cycle = 1
 duration = 12
 wallet = "wallet_1"
 slots = 2
 btc_address = "mr1iPkD9N3RJZZxXRk7xF9d36gffa6exNC"
 
 [[devnet.pox_stacking_orders]]
-start_at_cycle = 2
+start_at_cycle = 1
 duration = 12
 wallet = "wallet_2"
 slots = 1
 btc_address = "muYdXKmX9bByAueDe6KFfHd5Ff1gdN9ErG"
 
 [[devnet.pox_stacking_orders]]
-start_at_cycle = 2
+start_at_cycle = 1
 duration = 12
 wallet = "wallet_3"
 slots = 1
diff --git a/components/clarinet-deployments/Cargo.toml b/components/clarinet-deployments/Cargo.toml
index 0c88bd1c9..ccc8bfc95 100644
--- a/components/clarinet-deployments/Cargo.toml
+++ b/components/clarinet-deployments/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "clarinet-deployments"
-version = "2.4.1"
+version = "2.5.0"
 edition = "2021"
 
 [dependencies]
diff --git a/components/clarinet-files/Cargo.toml b/components/clarinet-files/Cargo.toml
index 885a2f0fd..6385c1f11 100644
--- a/components/clarinet-files/Cargo.toml
+++ b/components/clarinet-files/Cargo.toml
@@ -2,7 +2,7 @@
 name = "clarinet-files"
 description = "Clarinet manifests files helpers"
 license = "GPL-3.0"
-version = "2.4.1"
+version = "2.5.0"
 edition = "2021"
 
 [dependencies]
diff --git a/components/clarinet-sdk-wasm/Cargo.toml b/components/clarinet-sdk-wasm/Cargo.toml
index b888823cf..1e63dacd6 100644
--- a/components/clarinet-sdk-wasm/Cargo.toml
+++ b/components/clarinet-sdk-wasm/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "clarinet-sdk-wasm"
-version = "2.5.0-beta2"
+version = "2.5.0"
 license = "GPL-3.0"
 repository = "https://github.com/hirosystems/clarinet"
 description = "The core lib that powers @hirosystems/clarinet-sdk"
@@ -22,7 +22,6 @@ wasm-bindgen = { version = "0.2.91", optional = true }
 wasm-bindgen-futures = { version = "0.4.41", optional = true }
 web-sys = { version = "0.3", features = ["console"], optional = true }
 colored = "2.1.0"
-hashbrown = { version = "0.14.3", features = ["serde"]}
 
 clarinet-files = { path = "../clarinet-files", default-features = false }
 clarity-repl = { path = "../clarity-repl", default-features = false, optional = true }
diff --git a/components/clarity-repl/Cargo.toml b/components/clarity-repl/Cargo.toml
index 0c56b47b2..d60009018 100644
--- a/components/clarity-repl/Cargo.toml
+++ b/components/clarity-repl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "clarity-repl"
-version = "2.4.1"
+version = "2.5.0"
 description = "Clarity REPL"
 authors = [
     "Ludo Galabru <ludo@hiro.so>",
diff --git a/components/stacks-codec/Cargo.toml b/components/stacks-codec/Cargo.toml
index 40f8af47b..2c257b567 100644
--- a/components/stacks-codec/Cargo.toml
+++ b/components/stacks-codec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stacks-codec"
-version = "2.4.1"
+version = "2.5.0"
 license = "GPL-3.0"
 edition = "2021"
 description = "Stack wire format implementation"
diff --git a/components/stacks-devnet-js/Cargo.toml b/components/stacks-devnet-js/Cargo.toml
index bbaa89817..3da885bf1 100644
--- a/components/stacks-devnet-js/Cargo.toml
+++ b/components/stacks-devnet-js/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stacks-devnet-js"
-version = "2.4.1"
+version = "2.5.0"
 license = "ISC"
 edition = "2018"
 exclude = ["index.node"]
diff --git a/components/stacks-devnet-js/package.json b/components/stacks-devnet-js/package.json
index a8b8522c6..3800a2ac0 100644
--- a/components/stacks-devnet-js/package.json
+++ b/components/stacks-devnet-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hirosystems/stacks-devnet-js",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "description": "stacks-devnet-js is a library for writing end to end tests for protocols interacting with the Stacks blockchain and the Bitcoin blockchain.",
   "author": "Ludo Galabru",
   "repository": "https://github.com/hirosystems/clarinet/tree/main/components/stacks-devnet-js",
diff --git a/components/stacks-network/Cargo.toml b/components/stacks-network/Cargo.toml
index 90919965e..3e06dddbe 100644
--- a/components/stacks-network/Cargo.toml
+++ b/components/stacks-network/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stacks-network"
-version = "2.4.1"
+version = "2.5.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/components/stacks-network/src/chains_coordinator.rs b/components/stacks-network/src/chains_coordinator.rs
index acf6e50a5..c49b7b3ea 100644
--- a/components/stacks-network/src/chains_coordinator.rs
+++ b/components/stacks-network/src/chains_coordinator.rs
@@ -702,8 +702,7 @@ pub async fn publish_stacking_orders(
     let pox_cycle_length = pox_info.reward_cycle_length;
     let pox_cycle_position = effective_height % pox_cycle_length;
 
-    let should_submit_pox_orders = pox_cycle_position == 10;
-    if !should_submit_pox_orders {
+    if pox_cycle_position != 10 {
         return None;
     }
 
diff --git a/components/stacks-network/src/ui/ui.rs b/components/stacks-network/src/ui/ui.rs
index b6f251121..f2ecb3a94 100644
--- a/components/stacks-network/src/ui/ui.rs
+++ b/components/stacks-network/src/ui/ui.rs
@@ -228,7 +228,7 @@ fn draw_block_details(f: &mut Frame, area: Rect, block: &StacksBlockData) {
         Paragraph::new("PoX informations").style(Style::default().add_modifier(Modifier::BOLD));
     f.render_widget(title, labels[7]);
 
-    let label = format!("PoX Cycle: {}", block.metadata.pox_cycle_index + 1);
+    let label = format!("PoX Cycle: {}", block.metadata.pox_cycle_index);
     let paragraph = Paragraph::new(label);
     f.render_widget(paragraph, labels[8]);
 
diff --git a/components/stacks-rpc-client/Cargo.toml b/components/stacks-rpc-client/Cargo.toml
index d430331ba..c21e9bb4f 100644
--- a/components/stacks-rpc-client/Cargo.toml
+++ b/components/stacks-rpc-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stacks-rpc-client"
-version = "2.4.1"
+version = "2.5.0"
 description = "HTTP Client for the Stacks blockchain"
 license = "GPL-3.0"
 edition = "2021"