diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4fc37536d..ebb7468f71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ The minor version will be incremented upon a breaking change and the patch versi
 
 ### Fixes
 
+- cli: Manually limit `bytemuck_derive` to `">=1.8.1, <1.9.0"` ([#3609](https://github.com/coral-xyz/anchor/pull/3609)).
+
 ### Breaking
 
 ## [0.31.0] - 2025-03-08
diff --git a/cli/src/rust_template.rs b/cli/src/rust_template.rs
index 8ae060c78f..1ca23090bb 100644
--- a/cli/src/rust_template.rs
+++ b/cli/src/rust_template.rs
@@ -208,6 +208,9 @@ idl-build = ["anchor-lang/idl-build"]
 
 [dependencies]
 anchor-lang = "{3}"
+# Enforce bytemuck_derive version manually due to cargo 1.79 resolution bug.
+# More info here: https://github.com/Lokathor/bytemuck/issues/306
+bytemuck_derive = ">=1.8.1, <1.9.0"
 {4}
 "#,
         name,