diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e08feb92..6dfa2e7ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 - Support of optional file calib.dat on ADE7953 based energy monitors like Shelly EM (#16486)
 
 ### Changed
+- ESP32 Increase number of button GPIOs from 8 to 28 (#16518)
 
 ### Fixed
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 30e49b70d..395d1de51 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -133,6 +133,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 - Button debouncing V3 by adopting switch debounce code [#16339](https://github.com/arendst/Tasmota/issues/16339)
 - Thermostat max allowed temperature from 100 to 200C [#16363](https://github.com/arendst/Tasmota/issues/16363)
 - Using command ``SerialBuffer`` raise max allowed buffer size to 2048 characters [#16374](https://github.com/arendst/Tasmota/issues/16374)
+- ESP32 Increase number of button GPIOs from 8 to 28 [#16518](https://github.com/arendst/Tasmota/issues/16518)
 
 ### Fixed
 - RTC not detected when lights are present [#16242](https://github.com/arendst/Tasmota/issues/16242)
diff --git a/tasmota/include/tasmota.h b/tasmota/include/tasmota.h
index a9e21c796..d1992444f 100644
--- a/tasmota/include/tasmota.h
+++ b/tasmota/include/tasmota.h
@@ -49,13 +49,14 @@ const uint32_t POWER_SIZE = 32;             // Power (relay) bit count
 const uint8_t MAX_RELAYS = 8;               // Max number of relays (up to 28)
 const uint8_t MAX_INTERLOCKS = 4;           // Max number of interlock groups (up to MAX_INTERLOCKS_SET)
 const uint8_t MAX_SWITCHES = 8;             // Max number of switches (up to MAX_SWITCHES_SET)
+const uint8_t MAX_KEYS = 8;                 // Max number of keys or buttons (up to 28)
 #endif  // ESP8266
 #ifdef ESP32
 const uint8_t MAX_RELAYS = 28;              // Max number of relays (up to 28)
 const uint8_t MAX_INTERLOCKS = 14;          // Max number of interlock groups (up to MAX_INTERLOCKS_SET)
 const uint8_t MAX_SWITCHES = 28;            // Max number of switches (up to MAX_SWITCHES_SET)
+const uint8_t MAX_KEYS = 28;                // Max number of keys or buttons (up to 28)
 #endif  // ESP32
-const uint8_t MAX_KEYS = 8;                 // Max number of keys or buttons (up to 28)
 
 // Changes to the following MAX_ defines will impact settings layout
 const uint8_t MAX_INTERLOCKS_SET = 14;      // Max number of interlock groups (MAX_RELAYS / 2)