diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4105b927..29fafbdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+## [2.30.6] - 2024-12-18
+### Fixed
+- When renaming session templates during migration, use correct database key to store renamed template.
+
 ## [2.30.5] - 2024-10-15
 ### Fixed
 - Fix per-bootset CFS setting
diff --git a/src/bos/server/migrations/sanitize.py b/src/bos/server/migrations/sanitize.py
index d4171686..d61a5b8e 100644
--- a/src/bos/server/migrations/sanitize.py
+++ b/src/bos/server/migrations/sanitize.py
@@ -135,7 +135,7 @@ def _sanitize_session_template(key: str|bytes, data: dict) -> None:
 
     delete_template(key, data)
 
-    new_key = get_tenant_aware_key(name, tenant)
+    new_key = get_tenant_aware_key(new_name, tenant)
     LOGGER.info("Old DB key = '%s', new DB key = '%s'", key, new_key)
 
     new_data["name"] = new_name