diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6826bcd6..6fea567f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,20 @@ 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).
 
+## [1.22.0] - 2024-07-??
+
+### Added
+
+- firmware/flex: Added the suggestion buttons positions (used with keyboard)
+
+### Changed
+
+- firmware/stax: Updated the suggestion buttons positions (used with keyboard)
+
+### Fixed
+
+- firmware/flex: Wrong keyboard position
+
 ## [1.21.1] - 2024-07-16
 
 ### Fixed
diff --git a/src/ragger/firmware/touch/positions.py b/src/ragger/firmware/touch/positions.py
index 57a22d1a..896f3157 100644
--- a/src/ragger/firmware/touch/positions.py
+++ b/src/ragger/firmware/touch/positions.py
@@ -83,10 +83,16 @@ def __iter__(self):
         Firmware.STAX: {
             # 4 suggestions max, 2 rows of 2
             # indexes for left to right, from up to down
-            1: Position(100, 310),
-            2: Position(290, 310),
-            3: Position(110, 380),
-            4: Position(290, 380),
+            1: Position(100, 280),
+            2: Position(290, 280),
+            3: Position(110, 350),
+            4: Position(290, 350),
+        },
+        Firmware.FLEX: {
+            # On Flex, suggestions are on a single line, which can be swiped to access the last
+            # ones. At start, only 2 suggestions are clickable
+            1: Position(140, 300),
+            2: Position(350, 300),
         },
     },
     "LetterOnlyKeyboard": {
@@ -132,7 +138,7 @@ def __iter__(self):
             "y": Position(264, 415),
             "u": Position(312, 415),
             "i": Position(360, 415),
-            "o": Position(108, 415),
+            "o": Position(308, 415),
             "p": Position(456, 415),
             # second line
             "a": Position(48, 490),