diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 7227a5558e2..49197dc91e1 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -340,7 +340,7 @@ LED_MATRIX_DRIVER := snled27351
 endif
 
 LED_MATRIX_ENABLE ?= no
-VALID_LED_MATRIX_TYPES := is31fl3218 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 custom
+VALID_LED_MATRIX_TYPES := is31fl3218 is31fl3236 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 custom
 
 ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
     ifeq ($(filter $(LED_MATRIX_DRIVER),$(VALID_LED_MATRIX_TYPES)),)
@@ -365,6 +365,12 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
         SRC += is31fl3218-mono.c
     endif
 
+    ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3236)
+        I2C_DRIVER_REQUIRED = yes
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31fl3236-mono.c
+    endif
+
     ifeq ($(strip $(LED_MATRIX_DRIVER)), is31fl3729)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
@@ -443,7 +449,7 @@ endif
 
 RGB_MATRIX_ENABLE ?= no
 
-VALID_RGB_MATRIX_TYPES := aw20216s is31fl3218 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 ws2812 custom
+VALID_RGB_MATRIX_TYPES := aw20216s is31fl3218 is31fl3236 is31fl3729 is31fl3731 is31fl3733 is31fl3736 is31fl3737 is31fl3741 is31fl3742a is31fl3743a is31fl3745 is31fl3746a snled27351 ws2812 custom
 ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
     ifeq ($(filter $(RGB_MATRIX_DRIVER),$(VALID_RGB_MATRIX_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid RGB_MATRIX_DRIVER,RGB_MATRIX_DRIVER="$(RGB_MATRIX_DRIVER)" is not a valid matrix type)
@@ -474,6 +480,12 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
         SRC += is31fl3218.c
     endif
 
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3236)
+        I2C_DRIVER_REQUIRED = yes
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31fl3236.c
+    endif
+
     ifeq ($(strip $(RGB_MATRIX_DRIVER)), is31fl3729)
         I2C_DRIVER_REQUIRED = yes
         COMMON_VPATH += $(DRIVER_PATH)/led/issi
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 5c6788913b0..25aaabcf4a3 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -453,6 +453,7 @@
                     "enum": [
                         "custom",
                         "is31fl3218",
+                        "is31fl3236",
                         "is31fl3729",
                         "is31fl3731",
                         "is31fl3733",
@@ -535,6 +536,7 @@
                         "aw20216s",
                         "custom",
                         "is31fl3218",
+                        "is31fl3236",
                         "is31fl3729",
                         "is31fl3731",
                         "is31fl3733",
diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index b715c14041c..e6bc34e79ec 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -640,7 +640,7 @@ Configures the [RGB Matrix](feature_rgb_matrix.md) feature.
             * The default animation speed.
             * Default: `128`
     * `driver` (Required)
-        * The driver to use. Must be one of `aw20216s`, `custom`, `is31fl3218`, `is31fl3729`, `is31fl3731`, `is31fl3733`, `is31fl3736`, `is31fl3737`, `is31fl3741`, `is31fl3742a`, `is31fl3743a`, `is31fl3745`, `is31fl3746a`, `snled27351`, `ws2812`.
+        * The driver to use. Must be one of `aw20216s`, `custom`, `is31fl3218`, `is31fl3236`, `is31fl3729`, `is31fl3731`, `is31fl3733`, `is31fl3736`, `is31fl3737`, `is31fl3741`, `is31fl3742a`, `is31fl3743a`, `is31fl3745`, `is31fl3746a`, `snled27351`, `ws2812`.
     * `hue_steps`
         * The number of hue adjustment steps.
         * Default: `8`
diff --git a/drivers/led/issi/is31fl3236-mono.c b/drivers/led/issi/is31fl3236-mono.c
new file mode 100644
index 00000000000..b80245a1dc0
--- /dev/null
+++ b/drivers/led/issi/is31fl3236-mono.c
@@ -0,0 +1,168 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "is31fl3236-mono.h"
+#include "i2c_master.h"
+#include "gpio.h"
+
+#define IS31FL3236_PWM_REGISTER_COUNT 36
+#define IS31FL3236_LED_CONTROL_REGISTER_COUNT 36
+
+#ifndef IS31FL3236_I2C_TIMEOUT
+#    define IS31FL3236_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3236_I2C_PERSISTENCE
+#    define IS31FL3236_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3236_PWM_FREQUENCY
+#    define IS31FL3236_PWM_FREQUENCY IS31FL3236_PWM_FREQUENCY_3K_HZ // OFS - IS31FL3236A only
+#endif
+
+const uint8_t i2c_addresses[IS31FL3236_DRIVER_COUNT] = {
+    IS31FL3236_I2C_ADDRESS_1,
+#ifdef IS31FL3236_I2C_ADDRESS_2
+    IS31FL3236_I2C_ADDRESS_2,
+#    ifdef IS31FL3236_I2C_ADDRESS_3
+    IS31FL3236_I2C_ADDRESS_3,
+#        ifdef IS31FL3236_I2C_ADDRESS_4
+    IS31FL3236_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+typedef struct is31fl3236_driver_t {
+    uint8_t pwm_buffer[IS31FL3236_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3236_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3236_driver_t;
+
+is31fl3236_driver_t driver_buffers[IS31FL3236_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void is31fl3236_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3236_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3236_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3236_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3236_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3236_write_pwm_buffer(uint8_t index) {
+#if IS31FL3236_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3236_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3236_REG_PWM, driver_buffers[index].pwm_buffer, 36, IS31FL3236_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, IS31FL3236_REG_PWM, driver_buffers[index].pwm_buffer, 36, IS31FL3236_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3236_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3236_SDB_PIN)
+    gpio_set_pin_output(IS31FL3236_SDB_PIN);
+    gpio_write_pin_high(IS31FL3236_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3236_DRIVER_COUNT; i++) {
+        is31fl3236_init(i);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3236_LED_COUNT; i++) {
+        is31fl3236_set_led_control_register(i, true);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3236_DRIVER_COUNT; i++) {
+        is31fl3236_update_led_control_registers(i);
+    }
+}
+
+void is31fl3236_init(uint8_t index) {
+    // In case we ever want to reinitialize (?)
+    is31fl3236_write_register(index, IS31FL3236_REG_RESET, 0x00);
+
+    // Turn off software shutdown
+    is31fl3236_write_register(index, IS31FL3236_REG_SHUTDOWN, 0x01);
+
+    // Set all PWM values to zero
+    for (uint8_t i = 0; i < IS31FL3236_PWM_REGISTER_COUNT; i++) {
+        is31fl3236_write_register(index, IS31FL3236_REG_PWM + i, 0x00);
+    }
+
+    // turn off all LEDs in the LED control register
+    for (uint8_t i = 0; i < IS31FL3236_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3236_write_register(index, IS31FL3236_REG_LED_CONTROL + i, 0x00);
+    }
+
+    // Set PWM frequency (IS31FL3236A)
+    is31fl3236_write_register(index, IS31FL3236_REG_PWM_FREQUENCY, IS31FL3236_PWM_FREQUENCY);
+
+    // Load PWM registers and LED Control register data
+    is31fl3236_write_register(index, IS31FL3236_REG_UPDATE, 0x01);
+}
+
+void is31fl3236_set_value(int index, uint8_t value) {
+    is31fl3236_led_t led;
+
+    if (index < IS31FL3236_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3236_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.v] == value) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.v] = value;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3236_set_value_all(uint8_t value) {
+    for (uint8_t i = 0; i < IS31FL3236_LED_COUNT; i++) {
+        is31fl3236_set_value(i, value);
+    }
+}
+
+void is31fl3236_set_led_control_register(uint8_t index, bool value) {
+    is31fl3236_led_t led;
+    memcpy_P(&led, (&g_is31fl3236_leds[index]), sizeof(led));
+
+    driver_buffers[led.driver].led_control_buffer[led.v] = value ? 0x01 : 0x00;
+    driver_buffers[led.driver].led_control_buffer_dirty  = true;
+}
+
+void is31fl3236_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3236_write_pwm_buffer(index);
+        // Load PWM registers and LED Control register data
+        is31fl3236_write_register(index, IS31FL3236_REG_UPDATE, 0x01);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3236_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        for (uint8_t i = 0; i < IS31FL3236_LED_CONTROL_REGISTER_COUNT; i++) {
+            is31fl3236_write_register(index, IS31FL3236_REG_LED_CONTROL + i, driver_buffers[index].led_control_buffer[i]);
+        }
+
+        driver_buffers[index].led_control_buffer_dirty = false;
+    }
+}
+
+void is31fl3236_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3236_DRIVER_COUNT; i++) {
+        is31fl3236_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3236-mono.h b/drivers/led/issi/is31fl3236-mono.h
new file mode 100644
index 00000000000..90735bb1aa7
--- /dev/null
+++ b/drivers/led/issi/is31fl3236-mono.h
@@ -0,0 +1,101 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "progmem.h"
+#include "util.h"
+
+#define IS31FL3236_REG_SHUTDOWN 0x00
+#define IS31FL3236_REG_PWM 0x01
+#define IS31FL3236_REG_UPDATE 0x25
+#define IS31FL3236_REG_LED_CONTROL 0x26
+#define IS31FL3236_REG_GLOBAL_CONTROL 0x4A
+#define IS31FL3236_REG_PWM_FREQUENCY 0x4B
+#define IS31FL3236_REG_RESET 0x4F
+
+#define IS31FL3236_I2C_ADDRESS_GND 0x3C
+#define IS31FL3236_I2C_ADDRESS_SCL 0x3D
+#define IS31FL3236_I2C_ADDRESS_SDA 0x3E
+#define IS31FL3236_I2C_ADDRESS_VCC 0x3F
+
+#if defined(LED_MATRIX_IS31FL3236)
+#    define IS31FL3236_LED_COUNT LED_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3236_I2C_ADDRESS_4)
+#    define IS31FL3236_DRIVER_COUNT 4
+#elif defined(IS31FL3236_I2C_ADDRESS_3)
+#    define IS31FL3236_DRIVER_COUNT 3
+#elif defined(IS31FL3236_I2C_ADDRESS_2)
+#    define IS31FL3236_DRIVER_COUNT 2
+#elif defined(IS31FL3236_I2C_ADDRESS_1)
+#    define IS31FL3236_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3236_led_t {
+    uint8_t driver : 2;
+    uint8_t v;
+} PACKED is31fl3236_led_t;
+
+extern const is31fl3236_led_t PROGMEM g_is31fl3236_leds[IS31FL3236_LED_COUNT];
+
+void is31fl3236_init_drivers(void);
+
+void is31fl3236_init(uint8_t index);
+
+void is31fl3236_write_register(uint8_t index, uint8_t reg, uint8_t data);
+
+void is31fl3236_set_value(int index, uint8_t value);
+
+void is31fl3236_set_value_all(uint8_t value);
+
+void is31fl3236_set_led_control_register(uint8_t index, bool value);
+
+void is31fl3236_update_pwm_buffers(uint8_t index);
+
+void is31fl3236_update_led_control_registers(uint8_t index);
+
+void is31fl3236_flush(void);
+
+#define IS31FL3236_PWM_FREQUENCY_3K_HZ 0b0
+#define IS31FL3236_PWM_FREQUENCY_22K_HZ 0b1
+
+#define OUT1 0x00
+#define OUT2 0x01
+#define OUT3 0x02
+#define OUT4 0x03
+#define OUT5 0x04
+#define OUT6 0x05
+#define OUT7 0x06
+#define OUT8 0x07
+#define OUT9 0x08
+#define OUT10 0x09
+#define OUT11 0x0A
+#define OUT12 0x0B
+#define OUT13 0x0C
+#define OUT14 0x0D
+#define OUT15 0x0E
+#define OUT16 0x0F
+#define OUT17 0x10
+#define OUT18 0x11
+#define OUT19 0x12
+#define OUT20 0x13
+#define OUT21 0x14
+#define OUT22 0x15
+#define OUT23 0x16
+#define OUT24 0x17
+#define OUT25 0x18
+#define OUT26 0x19
+#define OUT27 0x1A
+#define OUT28 0x1B
+#define OUT29 0x1C
+#define OUT30 0x1D
+#define OUT31 0x1E
+#define OUT32 0x1F
+#define OUT33 0x20
+#define OUT34 0x21
+#define OUT35 0x22
+#define OUT36 0x23
diff --git a/drivers/led/issi/is31fl3236.c b/drivers/led/issi/is31fl3236.c
new file mode 100644
index 00000000000..b8aa9c34b1b
--- /dev/null
+++ b/drivers/led/issi/is31fl3236.c
@@ -0,0 +1,172 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "is31fl3236.h"
+#include "i2c_master.h"
+#include "gpio.h"
+
+#define IS31FL3236_PWM_REGISTER_COUNT 36
+#define IS31FL3236_LED_CONTROL_REGISTER_COUNT 36
+
+#ifndef IS31FL3236_I2C_TIMEOUT
+#    define IS31FL3236_I2C_TIMEOUT 100
+#endif
+
+#ifndef IS31FL3236_I2C_PERSISTENCE
+#    define IS31FL3236_I2C_PERSISTENCE 0
+#endif
+
+#ifndef IS31FL3236_PWM_FREQUENCY
+#    define IS31FL3236_PWM_FREQUENCY IS31FL3236_PWM_FREQUENCY_3K_HZ // OFS - IS31FL3236A only
+#endif
+
+const uint8_t i2c_addresses[IS31FL3236_DRIVER_COUNT] = {
+    IS31FL3236_I2C_ADDRESS_1,
+#ifdef IS31FL3236_I2C_ADDRESS_2
+    IS31FL3236_I2C_ADDRESS_2,
+#    ifdef IS31FL3236_I2C_ADDRESS_3
+    IS31FL3236_I2C_ADDRESS_3,
+#        ifdef IS31FL3236_I2C_ADDRESS_4
+    IS31FL3236_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
+typedef struct is31fl3236_driver_t {
+    uint8_t pwm_buffer[IS31FL3236_PWM_REGISTER_COUNT];
+    bool    pwm_buffer_dirty;
+    uint8_t led_control_buffer[IS31FL3236_LED_CONTROL_REGISTER_COUNT];
+    bool    led_control_buffer_dirty;
+} PACKED is31fl3236_driver_t;
+
+is31fl3236_driver_t driver_buffers[IS31FL3236_DRIVER_COUNT] = {{
+    .pwm_buffer               = {0},
+    .pwm_buffer_dirty         = false,
+    .led_control_buffer       = {0},
+    .led_control_buffer_dirty = false,
+}};
+
+void is31fl3236_write_register(uint8_t index, uint8_t reg, uint8_t data) {
+#if IS31FL3236_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3236_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3236_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3236_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3236_write_pwm_buffer(uint8_t index) {
+#if IS31FL3236_I2C_PERSISTENCE > 0
+    for (uint8_t i = 0; i < IS31FL3236_I2C_PERSISTENCE; i++) {
+        if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3236_REG_PWM, driver_buffers[index].pwm_buffer, 36, IS31FL3236_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+    }
+#else
+    i2c_write_register(i2c_addresses[index] << 1, IS31FL3236_REG_PWM, driver_buffers[index].pwm_buffer, 36, IS31FL3236_I2C_TIMEOUT);
+#endif
+}
+
+void is31fl3236_init_drivers(void) {
+    i2c_init();
+
+#if defined(IS31FL3236_SDB_PIN)
+    gpio_set_pin_output(IS31FL3236_SDB_PIN);
+    gpio_write_pin_high(IS31FL3236_SDB_PIN);
+#endif
+
+    for (uint8_t i = 0; i < IS31FL3236_DRIVER_COUNT; i++) {
+        is31fl3236_init(i);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3236_LED_COUNT; i++) {
+        is31fl3236_set_led_control_register(i, true, true, true);
+    }
+
+    for (uint8_t i = 0; i < IS31FL3236_DRIVER_COUNT; i++) {
+        is31fl3236_update_led_control_registers(i);
+    }
+}
+
+void is31fl3236_init(uint8_t index) {
+    // In case we ever want to reinitialize (?)
+    is31fl3236_write_register(index, IS31FL3236_REG_RESET, 0x00);
+
+    // Turn off software shutdown
+    is31fl3236_write_register(index, IS31FL3236_REG_SHUTDOWN, 0x01);
+
+    // Set all PWM values to zero
+    for (uint8_t i = 0; i < IS31FL3236_PWM_REGISTER_COUNT; i++) {
+        is31fl3236_write_register(index, IS31FL3236_REG_PWM + i, 0x00);
+    }
+
+    // turn off all LEDs in the LED control register
+    for (uint8_t i = 0; i < IS31FL3236_LED_CONTROL_REGISTER_COUNT; i++) {
+        is31fl3236_write_register(index, IS31FL3236_REG_LED_CONTROL + i, 0x00);
+    }
+
+    // Set PWM frequency (IS31FL3236A)
+    is31fl3236_write_register(index, IS31FL3236_REG_PWM_FREQUENCY, IS31FL3236_PWM_FREQUENCY);
+
+    // Load PWM registers and LED Control register data
+    is31fl3236_write_register(index, IS31FL3236_REG_UPDATE, 0x01);
+}
+
+void is31fl3236_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    is31fl3236_led_t led;
+
+    if (index < IS31FL3236_LED_COUNT) {
+        memcpy_P(&led, (&g_is31fl3236_leds[index]), sizeof(led));
+
+        if (driver_buffers[led.driver].pwm_buffer[led.r] == red && driver_buffers[led.driver].pwm_buffer[led.g] == green && driver_buffers[led.driver].pwm_buffer[led.b] == blue) {
+            return;
+        }
+
+        driver_buffers[led.driver].pwm_buffer[led.r] = red;
+        driver_buffers[led.driver].pwm_buffer[led.g] = green;
+        driver_buffers[led.driver].pwm_buffer[led.b] = blue;
+        driver_buffers[led.driver].pwm_buffer_dirty  = true;
+    }
+}
+
+void is31fl3236_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    for (uint8_t i = 0; i < IS31FL3236_LED_COUNT; i++) {
+        is31fl3236_set_color(i, red, green, blue);
+    }
+}
+
+void is31fl3236_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
+    is31fl3236_led_t led;
+    memcpy_P(&led, (&g_is31fl3236_leds[index]), sizeof(led));
+
+    driver_buffers[led.driver].led_control_buffer[led.r] = red ? 0x01 : 0x00;
+    driver_buffers[led.driver].led_control_buffer[led.g] = green ? 0x01 : 0x00;
+    driver_buffers[led.driver].led_control_buffer[led.b] = blue ? 0x01 : 0x00;
+    driver_buffers[led.driver].led_control_buffer_dirty  = true;
+}
+
+void is31fl3236_update_pwm_buffers(uint8_t index) {
+    if (driver_buffers[index].pwm_buffer_dirty) {
+        is31fl3236_write_pwm_buffer(index);
+        // Load PWM registers and LED Control register data
+        is31fl3236_write_register(index, IS31FL3236_REG_UPDATE, 0x01);
+
+        driver_buffers[index].pwm_buffer_dirty = false;
+    }
+}
+
+void is31fl3236_update_led_control_registers(uint8_t index) {
+    if (driver_buffers[index].led_control_buffer_dirty) {
+        for (uint8_t i = 0; i < IS31FL3236_LED_CONTROL_REGISTER_COUNT; i++) {
+            is31fl3236_write_register(index, IS31FL3236_REG_LED_CONTROL + i, driver_buffers[index].led_control_buffer[i]);
+        }
+
+        driver_buffers[index].led_control_buffer_dirty = false;
+    }
+}
+
+void is31fl3236_flush(void) {
+    for (uint8_t i = 0; i < IS31FL3236_DRIVER_COUNT; i++) {
+        is31fl3236_update_pwm_buffers(i);
+    }
+}
diff --git a/drivers/led/issi/is31fl3236.h b/drivers/led/issi/is31fl3236.h
new file mode 100644
index 00000000000..1e490796b26
--- /dev/null
+++ b/drivers/led/issi/is31fl3236.h
@@ -0,0 +1,103 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "progmem.h"
+#include "util.h"
+
+#define IS31FL3236_REG_SHUTDOWN 0x00
+#define IS31FL3236_REG_PWM 0x01
+#define IS31FL3236_REG_UPDATE 0x25
+#define IS31FL3236_REG_LED_CONTROL 0x26
+#define IS31FL3236_REG_GLOBAL_CONTROL 0x4A
+#define IS31FL3236_REG_PWM_FREQUENCY 0x4B
+#define IS31FL3236_REG_RESET 0x4F
+
+#define IS31FL3236_I2C_ADDRESS_GND 0x3C
+#define IS31FL3236_I2C_ADDRESS_SCL 0x3D
+#define IS31FL3236_I2C_ADDRESS_SDA 0x3E
+#define IS31FL3236_I2C_ADDRESS_VCC 0x3F
+
+#if defined(RGB_MATRIX_IS31FL3236)
+#    define IS31FL3236_LED_COUNT RGB_MATRIX_LED_COUNT
+#endif
+
+#if defined(IS31FL3236_I2C_ADDRESS_4)
+#    define IS31FL3236_DRIVER_COUNT 4
+#elif defined(IS31FL3236_I2C_ADDRESS_3)
+#    define IS31FL3236_DRIVER_COUNT 3
+#elif defined(IS31FL3236_I2C_ADDRESS_2)
+#    define IS31FL3236_DRIVER_COUNT 2
+#elif defined(IS31FL3236_I2C_ADDRESS_1)
+#    define IS31FL3236_DRIVER_COUNT 1
+#endif
+
+typedef struct is31fl3236_led_t {
+    uint8_t driver : 2;
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+} PACKED is31fl3236_led_t;
+
+extern const is31fl3236_led_t PROGMEM g_is31fl3236_leds[IS31FL3236_LED_COUNT];
+
+void is31fl3236_init_drivers(void);
+
+void is31fl3236_init(uint8_t index);
+
+void is31fl3236_write_register(uint8_t index, uint8_t reg, uint8_t data);
+
+void is31fl3236_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
+
+void is31fl3236_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+
+void is31fl3236_set_led_control_register(uint8_t index, bool red, bool green, bool blue);
+
+void is31fl3236_update_pwm_buffers(uint8_t index);
+
+void is31fl3236_update_led_control_registers(uint8_t index);
+
+void is31fl3236_flush(void);
+
+#define IS31FL3236_PWM_FREQUENCY_3K_HZ 0b0
+#define IS31FL3236_PWM_FREQUENCY_22K_HZ 0b1
+
+#define OUT1 0x00
+#define OUT2 0x01
+#define OUT3 0x02
+#define OUT4 0x03
+#define OUT5 0x04
+#define OUT6 0x05
+#define OUT7 0x06
+#define OUT8 0x07
+#define OUT9 0x08
+#define OUT10 0x09
+#define OUT11 0x0A
+#define OUT12 0x0B
+#define OUT13 0x0C
+#define OUT14 0x0D
+#define OUT15 0x0E
+#define OUT16 0x0F
+#define OUT17 0x10
+#define OUT18 0x11
+#define OUT19 0x12
+#define OUT20 0x13
+#define OUT21 0x14
+#define OUT22 0x15
+#define OUT23 0x16
+#define OUT24 0x17
+#define OUT25 0x18
+#define OUT26 0x19
+#define OUT27 0x1A
+#define OUT28 0x1B
+#define OUT29 0x1C
+#define OUT30 0x1D
+#define OUT31 0x1E
+#define OUT32 0x1F
+#define OUT33 0x20
+#define OUT34 0x21
+#define OUT35 0x22
+#define OUT36 0x23
diff --git a/quantum/led_matrix/led_matrix_drivers.c b/quantum/led_matrix/led_matrix_drivers.c
index 2e80bd03752..bd4852e9395 100644
--- a/quantum/led_matrix/led_matrix_drivers.c
+++ b/quantum/led_matrix/led_matrix_drivers.c
@@ -33,6 +33,14 @@ const led_matrix_driver_t led_matrix_driver = {
     .set_value_all = is31fl3218_set_value_all,
 };
 
+#elif defined(LED_MATRIX_IS31FL3236)
+const led_matrix_driver_t led_matrix_driver = {
+    .init          = is31fl3236_init_drivers,
+    .flush         = is31fl3236_flush,
+    .set_value     = is31fl3236_set_value,
+    .set_value_all = is31fl3236_set_value_all,
+};
+
 #elif defined(LED_MATRIX_IS31FL3729)
 const led_matrix_driver_t led_matrix_driver = {
     .init          = is31fl3729_init_drivers,
diff --git a/quantum/led_matrix/led_matrix_drivers.h b/quantum/led_matrix/led_matrix_drivers.h
index a961784a62f..60354e46779 100644
--- a/quantum/led_matrix/led_matrix_drivers.h
+++ b/quantum/led_matrix/led_matrix_drivers.h
@@ -7,6 +7,8 @@
 
 #if defined(LED_MATRIX_IS31FL3218)
 #    include "is31fl3218-mono.h"
+#elif defined(LED_MATRIX_IS31FL3236)
+#    include "is31fl3236-mono.h"
 #elif defined(LED_MATRIX_IS31FL3729)
 #    include "is31fl3729-mono.h"
 #elif defined(LED_MATRIX_IS31FL3731)
diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index 95d1e884f09..729dcdb4395 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -36,6 +36,14 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
     .set_color_all = is31fl3218_set_color_all,
 };
 
+#elif defined(RGB_MATRIX_IS31FL3236)
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init          = is31fl3236_init_drivers,
+    .flush         = is31fl3236_flush,
+    .set_color     = is31fl3236_set_color,
+    .set_color_all = is31fl3236_set_color_all,
+};
+
 #elif defined(RGB_MATRIX_IS31FL3729)
 const rgb_matrix_driver_t rgb_matrix_driver = {
     .init          = is31fl3729_init_drivers,
diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.h b/quantum/rgb_matrix/rgb_matrix_drivers.h
index a24cb03a185..1ea5f0817d3 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.h
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.h
@@ -7,6 +7,8 @@
 
 #if defined(RGB_MATRIX_AW20216S)
 #    include "aw20216s.h"
+#elif defined(RGB_MATRIX_IS31FL3236)
+#    include "is31fl3236.h"
 #elif defined(RGB_MATRIX_IS31FL3218)
 #    include "is31fl3218.h"
 #elif defined(RGB_MATRIX_IS31FL3729)