diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 5730c61536aca..857e2571ed47f 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -4099,7 +4099,8 @@ PMCI:
     - kehintel
   files:
     - subsys/pmci/
-    - samples/modules/pmci/
+    - samples/subsys/pmci/
+    - include/zephyr/pmci/
   labels:
     - "area: PMCI"
 
diff --git a/doc/_scripts/redirects.py b/doc/_scripts/redirects.py
index fbc7afd4131b2..b7ab9b27ec57f 100644
--- a/doc/_scripts/redirects.py
+++ b/doc/_scripts/redirects.py
@@ -306,6 +306,10 @@
     ('samples/drivers/led_sx1509b_intensity/README', 'samples/drivers/led/sx1509b_intensity/README'),
     ('samples/drivers/led_ws2812/README', 'samples/drivers/led_strip/README'),
     ('samples/drivers/led_xec/README', 'samples/drivers/led/xec/README'),
+    ('samples/modules/pmci/mctp/endpoint/README', 'samples/subsys/pmci/mctp/endpoint/README'),
+    ('samples/modules/pmci/mctp/host/README', 'samples/subsys/pmci/mctp/host/README'),
+    ('samples/modules/pmci/mctp/i2c_gpio_bus_endpoint/README', 'samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint/README'),
+    ('samples/modules/pmci/mctp/i2c_gpio_bus_owner/README', 'samples/subsys/pmci/mctp/i2c_gpio_bus_owner/README'),
     ('samples/net/cloud/google_iot_mqtt/README', 'samples/net/net'),
     ('samples/sensor/max44009/README', 'samples/sensor/light_polling/README'),
     ('samples/sensor/wsen_hids/README', 'samples/sensor/sensor'),
diff --git a/samples/modules/pmci/index.rst b/samples/subsys/pmci/index.rst
similarity index 100%
rename from samples/modules/pmci/index.rst
rename to samples/subsys/pmci/index.rst
diff --git a/samples/modules/pmci/mctp/endpoint/CMakeLists.txt b/samples/subsys/pmci/mctp/endpoint/CMakeLists.txt
similarity index 100%
rename from samples/modules/pmci/mctp/endpoint/CMakeLists.txt
rename to samples/subsys/pmci/mctp/endpoint/CMakeLists.txt
diff --git a/samples/modules/pmci/mctp/endpoint/README.rst b/samples/subsys/pmci/mctp/endpoint/README.rst
similarity index 95%
rename from samples/modules/pmci/mctp/endpoint/README.rst
rename to samples/subsys/pmci/mctp/endpoint/README.rst
index a7e2f28047f88..89110ff7141f9 100644
--- a/samples/modules/pmci/mctp/endpoint/README.rst
+++ b/samples/subsys/pmci/mctp/endpoint/README.rst
@@ -29,7 +29,7 @@ Building and Running
 
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/modules/pmci/mctp/endpoint
+   :zephyr-app: samples/subsys/pmci/mctp/endpoint
    :host-os: unix
    :board: nrf52840_nrf52840dk
    :goals: run
diff --git a/samples/modules/pmci/mctp/endpoint/boards/nrf52840dk_nrf52840.overlay b/samples/subsys/pmci/mctp/endpoint/boards/nrf52840dk_nrf52840.overlay
similarity index 100%
rename from samples/modules/pmci/mctp/endpoint/boards/nrf52840dk_nrf52840.overlay
rename to samples/subsys/pmci/mctp/endpoint/boards/nrf52840dk_nrf52840.overlay
diff --git a/samples/modules/pmci/mctp/endpoint/prj.conf b/samples/subsys/pmci/mctp/endpoint/prj.conf
similarity index 100%
rename from samples/modules/pmci/mctp/endpoint/prj.conf
rename to samples/subsys/pmci/mctp/endpoint/prj.conf
diff --git a/samples/modules/pmci/mctp/endpoint/src/main.c b/samples/subsys/pmci/mctp/endpoint/src/main.c
similarity index 100%
rename from samples/modules/pmci/mctp/endpoint/src/main.c
rename to samples/subsys/pmci/mctp/endpoint/src/main.c
diff --git a/samples/modules/pmci/mctp/host/CMakeLists.txt b/samples/subsys/pmci/mctp/host/CMakeLists.txt
similarity index 100%
rename from samples/modules/pmci/mctp/host/CMakeLists.txt
rename to samples/subsys/pmci/mctp/host/CMakeLists.txt
diff --git a/samples/modules/pmci/mctp/host/README.rst b/samples/subsys/pmci/mctp/host/README.rst
similarity index 95%
rename from samples/modules/pmci/mctp/host/README.rst
rename to samples/subsys/pmci/mctp/host/README.rst
index e1eb0abf7567c..a97cd5a6ca03f 100644
--- a/samples/modules/pmci/mctp/host/README.rst
+++ b/samples/subsys/pmci/mctp/host/README.rst
@@ -28,7 +28,7 @@ Building and Running
 ********************
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/modules/pmci/mctp/host
+   :zephyr-app: samples/subsys/pmci/mctp/host
    :host-os: unix
    :board: nrf52840_nrf52840dk
    :goals: run
diff --git a/samples/modules/pmci/mctp/host/boards/nrf52840dk_nrf52840.overlay b/samples/subsys/pmci/mctp/host/boards/nrf52840dk_nrf52840.overlay
similarity index 100%
rename from samples/modules/pmci/mctp/host/boards/nrf52840dk_nrf52840.overlay
rename to samples/subsys/pmci/mctp/host/boards/nrf52840dk_nrf52840.overlay
diff --git a/samples/modules/pmci/mctp/host/prj.conf b/samples/subsys/pmci/mctp/host/prj.conf
similarity index 100%
rename from samples/modules/pmci/mctp/host/prj.conf
rename to samples/subsys/pmci/mctp/host/prj.conf
diff --git a/samples/modules/pmci/mctp/host/src/main.c b/samples/subsys/pmci/mctp/host/src/main.c
similarity index 100%
rename from samples/modules/pmci/mctp/host/src/main.c
rename to samples/subsys/pmci/mctp/host/src/main.c
diff --git a/samples/modules/pmci/mctp/i2c_gpio_bus_endpoint/CMakeLists.txt b/samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint/CMakeLists.txt
similarity index 100%
rename from samples/modules/pmci/mctp/i2c_gpio_bus_endpoint/CMakeLists.txt
rename to samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint/CMakeLists.txt
diff --git a/samples/modules/pmci/mctp/i2c_gpio_bus_endpoint/README.rst b/samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint/README.rst
similarity index 92%
rename from samples/modules/pmci/mctp/i2c_gpio_bus_endpoint/README.rst
rename to samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint/README.rst
index 1457729f320ec..c41a8c4c69be1 100644
--- a/samples/modules/pmci/mctp/i2c_gpio_bus_endpoint/README.rst
+++ b/samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint/README.rst
@@ -20,7 +20,7 @@ Building and Running
 ********************
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/modules/pmci/mctp/i2c_gpio_bus_endpoint
+   :zephyr-app: samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint
    :host-os: unix
    :board: frdm_mcxn947_mcxn947_cpu0
    :goals: run
diff --git a/samples/modules/pmci/mctp/i2c_gpio_bus_endpoint/boards/frdm_mcxn947_mcxn947_cpu0.overlay b/samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint/boards/frdm_mcxn947_mcxn947_cpu0.overlay
similarity index 100%
rename from samples/modules/pmci/mctp/i2c_gpio_bus_endpoint/boards/frdm_mcxn947_mcxn947_cpu0.overlay
rename to samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint/boards/frdm_mcxn947_mcxn947_cpu0.overlay
diff --git a/samples/modules/pmci/mctp/i2c_gpio_bus_endpoint/prj.conf b/samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint/prj.conf
similarity index 100%
rename from samples/modules/pmci/mctp/i2c_gpio_bus_endpoint/prj.conf
rename to samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint/prj.conf
diff --git a/samples/modules/pmci/mctp/i2c_gpio_bus_endpoint/src/main.c b/samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint/src/main.c
similarity index 100%
rename from samples/modules/pmci/mctp/i2c_gpio_bus_endpoint/src/main.c
rename to samples/subsys/pmci/mctp/i2c_gpio_bus_endpoint/src/main.c
diff --git a/samples/modules/pmci/mctp/i2c_gpio_bus_owner/CMakeLists.txt b/samples/subsys/pmci/mctp/i2c_gpio_bus_owner/CMakeLists.txt
similarity index 100%
rename from samples/modules/pmci/mctp/i2c_gpio_bus_owner/CMakeLists.txt
rename to samples/subsys/pmci/mctp/i2c_gpio_bus_owner/CMakeLists.txt
diff --git a/samples/modules/pmci/mctp/i2c_gpio_bus_owner/README.rst b/samples/subsys/pmci/mctp/i2c_gpio_bus_owner/README.rst
similarity index 93%
rename from samples/modules/pmci/mctp/i2c_gpio_bus_owner/README.rst
rename to samples/subsys/pmci/mctp/i2c_gpio_bus_owner/README.rst
index 442f8446ceccf..4c3a272c2ca80 100644
--- a/samples/modules/pmci/mctp/i2c_gpio_bus_owner/README.rst
+++ b/samples/subsys/pmci/mctp/i2c_gpio_bus_owner/README.rst
@@ -20,7 +20,7 @@ Building and Running
 ********************
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/modules/pmci/mctp/i2c_gpio_bus_owner
+   :zephyr-app: samples/subsys/pmci/mctp/i2c_gpio_bus_owner
    :host-os: unix
    :board: frdm_mcxn947_mcxn947_cpu0
    :goals: run
diff --git a/samples/modules/pmci/mctp/i2c_gpio_bus_owner/boards/frdm_mcxn947_mcxn947_cpu0.overlay b/samples/subsys/pmci/mctp/i2c_gpio_bus_owner/boards/frdm_mcxn947_mcxn947_cpu0.overlay
similarity index 100%
rename from samples/modules/pmci/mctp/i2c_gpio_bus_owner/boards/frdm_mcxn947_mcxn947_cpu0.overlay
rename to samples/subsys/pmci/mctp/i2c_gpio_bus_owner/boards/frdm_mcxn947_mcxn947_cpu0.overlay
diff --git a/samples/modules/pmci/mctp/i2c_gpio_bus_owner/prj.conf b/samples/subsys/pmci/mctp/i2c_gpio_bus_owner/prj.conf
similarity index 100%
rename from samples/modules/pmci/mctp/i2c_gpio_bus_owner/prj.conf
rename to samples/subsys/pmci/mctp/i2c_gpio_bus_owner/prj.conf
diff --git a/samples/modules/pmci/mctp/i2c_gpio_bus_owner/src/main.c b/samples/subsys/pmci/mctp/i2c_gpio_bus_owner/src/main.c
similarity index 100%
rename from samples/modules/pmci/mctp/i2c_gpio_bus_owner/src/main.c
rename to samples/subsys/pmci/mctp/i2c_gpio_bus_owner/src/main.c
diff --git a/samples/modules/pmci/mctp/mctp.rst b/samples/subsys/pmci/mctp/mctp.rst
similarity index 100%
rename from samples/modules/pmci/mctp/mctp.rst
rename to samples/subsys/pmci/mctp/mctp.rst