diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac98b0027..b46ff2216 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,11 @@ Add user-visible overlay work under **`## [Unreleased]`** in the same change set
 
 ## [Unreleased]
 
-## [1.17.1-ev2] - unpublished bench pin
+## [1.18.0-ev2] - unpublished bench pin
+
+### Changed
+
+- **MeshCore repeater-v1.18.0.** Stamp is `1.18.0-ev2`. `companion-v1.18.0` and `room-server-v1.18.0` are the same commit.
 
 ### Added
 
diff --git a/FRESHEN.lock b/FRESHEN.lock
index 5027d6efb..d1af45172 100644
--- a/FRESHEN.lock
+++ b/FRESHEN.lock
@@ -1,17 +1,18 @@
 # EnvyOS fleet release manifest.
-# Policy v2: companion tag merged onto envyos overlay. No vk496 OTA replay.
+# Policy v2: repeater tag merged onto envyos overlay. No vk496 OTA replay.
+# companion-v* and room-server-v* name the same commit. Record repeater-v*.
 # See .cursor/skills/envyos-freshen/SKILL.md and docs/integration-policy.md.
 
 policy_version: 2
 mode: integrate
-meshcore_tag: companion-v1.17.1
-meshcore_sha: d9296435
-integrate_branch: envyos/integrate/companion-v1.17.1
-envyos_main_sha: 2cf4a528
-last_integrate: 2026-08-29
+meshcore_tag: repeater-v1.18.0
+meshcore_sha: 81dbae59
+integrate_branch: envyos/integrate/repeater-v1.18.0
+envyos_main_sha: 1f6480b3
+last_integrate: 2026-10-16
 notes: >-
-  Merged companion-v1.17.1 into the 1.17.0 overlay, then pulled current envyos/main
-  (EnvyBoot version marker + T096 slim). Kept EnvyOS OTA target/hw id +
-  BLE_DFU_DISABLED; took 1.17.1 FEM PA-gain hooks and CC310 nRFCrypto.
-  EnvyOS -DCONFIG_MAX_TOKEN_LEN=512 (ota.signers is 256 hex). rd_len uint16_t so
-  that override works (upstream PR). vk496 replay: no.
+  Merged repeater-v1.18.0 (same commit as companion-v1.18.0 and
+  room-server-v1.18.0) onto the 1.17.1-ev2 overlay. Kept OTA, hop retry,
+  log tail, CLI try, rd_len uint16_t, and slim envs. Took upstream ACK
+  retransmit delay, Companion CLI, and DynamicConfigSerializer.
+  vk496 replay: no.