diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0c17664e..61fb8e515 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ IMPROVEMENTS:
 BUG FIXES:
 
   - command/package: Fix SecureRandom constant error [GH-8159]
+  - core/environment: Prevent persisting original environment variable if name is empty
+      [GH-8198, GH-8126]
   - guests/linux: Fix guest detection for names with spaces [GH-8092]
   - guests/redhat: Fix network interface configuration [GH-8148]