diff --git a/RELEASENOTES.general.md b/RELEASENOTES.general.md
index 23fd58e719..b8bbb80c60 100644
--- a/RELEASENOTES.general.md
+++ b/RELEASENOTES.general.md
@@ -1,6 +1,11 @@
 <!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
 <!-- On release, add general notes here. In time the legacy release notes will be add to this -->
 
+## 2.21.1 - May 18, 2023
+
+## Fixed
+
+- Fixed grid column size classes where the `slds-col-` class now applies 'flex: 1 1 auto,' which breaks grid layouts when combined with `slds-small|medium|large-size_*` classes. This results in incomplete rows and layout issues.
 
 ## 2.21.0 - April 20, 2023
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0042a74f8e..1eb029d4fd 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,6 +1,11 @@
 <!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
 <!-- !!! THIS FILE IS AUTO-GENERATED !!! DO NOT EDIT THIS FILE MANUALLY !!! -->
 
+## Release 2.21.1 - May 18, 2023
+
+## Fixed
+- Fixed grid column size classes where the `slds-col-` class now applies 'flex: 1 1 auto,' which breaks grid layouts when combined with `slds-small|medium|large-size_*` classes. This results in incomplete rows and layout issues.
+
 ## Release 2.21.0 - April 20, 2023
 
 ## Fixed
diff --git a/ui/_config.scss b/ui/_config.scss
index 27dbaa0b60..01e083d907 100644
--- a/ui/_config.scss
+++ b/ui/_config.scss
@@ -9,7 +9,7 @@
 ///
 /// @type String
 /// @access private
-$app-version: "2.21.0";
+$app-version: "2.21.1";
 
 /// Debug mode (uncomment to activate)
 /// Turn on to output deprecation warnings during development