diff --git a/app/drivers/gpio/CMakeLists.txt b/app/drivers/gpio/CMakeLists.txt
index 984cae64..1dc6ad25 100644
--- a/app/drivers/gpio/CMakeLists.txt
+++ b/app/drivers/gpio/CMakeLists.txt
@@ -1,5 +1,8 @@
 # Copyright (c) 2022 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-add_subdirectory_ifdef(CONFIG_GPIO_MCP23017 mcp23017)
-add_subdirectory_ifdef(CONFIG_GPIO_MAX7318 max7318)
+zephyr_library_named(zmk__drivers__gpio)
+zephyr_library_include_directories(${CMAKE_SOURCE_DIR}/include)
+
+zephyr_library_sources_ifdef(CONFIG_GPIO_MCP23017 gpio_mcp23017.c)
+zephyr_library_sources_ifndef(CONFIG_GPIO_MCP23017 ${ZEPHYR_BASE}/misc/empty_file.c)
diff --git a/app/drivers/gpio/Kconfig b/app/drivers/gpio/Kconfig
index 78c6d285..09f9609f 100644
--- a/app/drivers/gpio/Kconfig
+++ b/app/drivers/gpio/Kconfig
@@ -1,2 +1 @@
-rsource "mcp23017/Kconfig"
-rsource "max7318/Kconfig"
+rsource "Kconfig.mcp23017"
diff --git a/app/drivers/gpio/mcp23017/Kconfig b/app/drivers/gpio/Kconfig.mcp23017
similarity index 100%
rename from app/drivers/gpio/mcp23017/Kconfig
rename to app/drivers/gpio/Kconfig.mcp23017
diff --git a/app/drivers/gpio/mcp23017/gpio_mcp23017.c b/app/drivers/gpio/gpio_mcp23017.c
similarity index 100%
rename from app/drivers/gpio/mcp23017/gpio_mcp23017.c
rename to app/drivers/gpio/gpio_mcp23017.c
diff --git a/app/drivers/gpio/mcp23017/gpio_mcp23017.h b/app/drivers/gpio/gpio_mcp23017.h
similarity index 100%
rename from app/drivers/gpio/mcp23017/gpio_mcp23017.h
rename to app/drivers/gpio/gpio_mcp23017.h
diff --git a/app/drivers/gpio/mcp23017/CMakeLists.txt b/app/drivers/gpio/mcp23017/CMakeLists.txt
deleted file mode 100644
index b879b238..00000000
--- a/app/drivers/gpio/mcp23017/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2020 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-zephyr_library_named(zmk__drivers__gpio)
-zephyr_library_include_directories(${CMAKE_SOURCE_DIR}/include)
-
-zephyr_library_sources_ifdef(CONFIG_GPIO_MCP23017 gpio_mcp23017.c)
-zephyr_library_sources_ifndef(CONFIG_GPIO_MCP23017 ${ZEPHYR_BASE}/misc/empty_file.c)