diff --git a/components/esp_hw_support/CMakeLists.txt b/components/esp_hw_support/CMakeLists.txt
index b57f6891d31..1f2eac4556d 100644
--- a/components/esp_hw_support/CMakeLists.txt
+++ b/components/esp_hw_support/CMakeLists.txt
@@ -71,7 +71,8 @@ if(NOT non_os_build)
             )
         if(CONFIG_SOC_PAU_SUPPORTED AND CONFIG_SOC_PM_SUPPORT_TOP_PD)
             list(APPEND srcs "sleep_system_peripheral.c")
-            list(APPEND srcs "port/${target}/peripheral_domain_pd.c")
+            list(APPEND srcs "port/${target}/peripheral_domain_pd.c"
+                         "port/${target}/system_periph_retention.c")
         endif()
     endif()
 
diff --git a/components/soc/esp32c5/include/soc/system_periph_retention.h b/components/esp_hw_support/port/esp32c5/include/soc/system_periph_retention.h
similarity index 100%
rename from components/soc/esp32c5/include/soc/system_periph_retention.h
rename to components/esp_hw_support/port/esp32c5/include/soc/system_periph_retention.h
diff --git a/components/soc/esp32c5/system_retention_periph.c b/components/esp_hw_support/port/esp32c5/system_periph_retention.c
similarity index 100%
rename from components/soc/esp32c5/system_retention_periph.c
rename to components/esp_hw_support/port/esp32c5/system_periph_retention.c
diff --git a/components/soc/esp32c6/include/soc/system_periph_retention.h b/components/esp_hw_support/port/esp32c6/include/soc/system_periph_retention.h
similarity index 100%
rename from components/soc/esp32c6/include/soc/system_periph_retention.h
rename to components/esp_hw_support/port/esp32c6/include/soc/system_periph_retention.h
diff --git a/components/soc/esp32c6/system_retention_periph.c b/components/esp_hw_support/port/esp32c6/system_periph_retention.c
similarity index 100%
rename from components/soc/esp32c6/system_retention_periph.c
rename to components/esp_hw_support/port/esp32c6/system_periph_retention.c
diff --git a/components/soc/esp32c61/include/soc/system_periph_retention.h b/components/esp_hw_support/port/esp32c61/include/soc/system_periph_retention.h
similarity index 100%
rename from components/soc/esp32c61/include/soc/system_periph_retention.h
rename to components/esp_hw_support/port/esp32c61/include/soc/system_periph_retention.h
diff --git a/components/soc/esp32c61/system_retention_periph.c b/components/esp_hw_support/port/esp32c61/system_periph_retention.c
similarity index 100%
rename from components/soc/esp32c61/system_retention_periph.c
rename to components/esp_hw_support/port/esp32c61/system_periph_retention.c
diff --git a/components/soc/esp32h2/include/soc/system_periph_retention.h b/components/esp_hw_support/port/esp32h2/include/soc/system_periph_retention.h
similarity index 100%
rename from components/soc/esp32h2/include/soc/system_periph_retention.h
rename to components/esp_hw_support/port/esp32h2/include/soc/system_periph_retention.h
diff --git a/components/soc/esp32h2/system_retention_periph.c b/components/esp_hw_support/port/esp32h2/system_periph_retention.c
similarity index 100%
rename from components/soc/esp32h2/system_retention_periph.c
rename to components/esp_hw_support/port/esp32h2/system_periph_retention.c
diff --git a/components/soc/esp32h21/include/soc/system_periph_retention.h b/components/esp_hw_support/port/esp32h21/include/soc/system_periph_retention.h
similarity index 100%
rename from components/soc/esp32h21/include/soc/system_periph_retention.h
rename to components/esp_hw_support/port/esp32h21/include/soc/system_periph_retention.h
diff --git a/components/soc/esp32h21/system_retention_periph.c b/components/esp_hw_support/port/esp32h21/system_periph_retention.c
similarity index 100%
rename from components/soc/esp32h21/system_retention_periph.c
rename to components/esp_hw_support/port/esp32h21/system_periph_retention.c
diff --git a/components/soc/esp32h4/include/soc/system_periph_retention.h b/components/esp_hw_support/port/esp32h4/include/soc/system_periph_retention.h
similarity index 100%
rename from components/soc/esp32h4/include/soc/system_periph_retention.h
rename to components/esp_hw_support/port/esp32h4/include/soc/system_periph_retention.h
diff --git a/components/soc/esp32h4/system_retention_periph.c b/components/esp_hw_support/port/esp32h4/system_periph_retention.c
similarity index 100%
rename from components/soc/esp32h4/system_retention_periph.c
rename to components/esp_hw_support/port/esp32h4/system_periph_retention.c
diff --git a/components/soc/esp32p4/include/soc/system_periph_retention.h b/components/esp_hw_support/port/esp32p4/include/soc/system_periph_retention.h
similarity index 100%
rename from components/soc/esp32p4/include/soc/system_periph_retention.h
rename to components/esp_hw_support/port/esp32p4/include/soc/system_periph_retention.h
diff --git a/components/soc/esp32p4/system_retention_periph.c b/components/esp_hw_support/port/esp32p4/system_periph_retention.c
similarity index 99%
rename from components/soc/esp32p4/system_retention_periph.c
rename to components/esp_hw_support/port/esp32p4/system_periph_retention.c
index 8b3aa288c4a..a7ce4f557f9 100644
--- a/components/soc/esp32p4/system_retention_periph.c
+++ b/components/esp_hw_support/port/esp32p4/system_periph_retention.c
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "sdkconfig.h"
 #include "soc/cache_reg.h"
 #include "soc/gpio_reg.h"
 #include "soc/hp_system_reg.h"
diff --git a/components/soc/CMakeLists.txt b/components/soc/CMakeLists.txt
index c075f731ecb..f67b3495361 100644
--- a/components/soc/CMakeLists.txt
+++ b/components/soc/CMakeLists.txt
@@ -80,10 +80,6 @@ if(CONFIG_SOC_MPI_SUPPORTED)
     list(APPEND srcs "${target_folder}/mpi_periph.c")
 endif()
 
-if(CONFIG_SOC_PAU_SUPPORTED AND CONFIG_SOC_LIGHT_SLEEP_SUPPORTED AND CONFIG_SOC_PM_SUPPORT_TOP_PD)
-    list(APPEND srcs "${target_folder}/system_retention_periph.c")
-endif()
-
 if(CONFIG_SOC_BOD_SUPPORTED)
     list(APPEND srcs "${target_folder}/power_supply_periph.c")
 endif()