diff --git a/Kconfig b/Kconfig
index 1785114112..f7213f8082 100644
--- a/Kconfig
+++ b/Kconfig
@@ -159,6 +159,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
     config IDF_TARGET_LINUX
         bool
         default "y" if IDF_TARGET="linux"
+        select FREERTOS_UNICORE
 
     config IDF_FIRMWARE_CHIP_ID
         hex
diff --git a/components/freertos/Kconfig b/components/freertos/Kconfig
index cff15aab55..92498e83df 100644
--- a/components/freertos/Kconfig
+++ b/components/freertos/Kconfig
@@ -6,8 +6,8 @@ menu "FreeRTOS"
 
         config FREERTOS_SMP
             bool "Run the Amazon SMP FreeRTOS kernel instead (FEATURE UNDER DEVELOPMENT)"
-            # TODO: IDF-8113: Enable P4/H4/S31 support on AMZ SMP
-            depends on !IDF_TARGET_ESP32P4 && !IDF_TARGET_ESP32H4 && !IDF_TARGET_ESP32S31
+            # TODO: IDF-8113: Enable support on all targets
+            depends on IDF_TARGET_ESP32
             default  "n"
             help
                 Amazon has released an SMP version of the FreeRTOS Kernel which can be found via the following link:
@@ -24,7 +24,6 @@ menu "FreeRTOS"
         config FREERTOS_UNICORE
             # Todo: Replace with CONFIG_NUMBER_OF_CORES (IDF-9156)
             bool "Run FreeRTOS only on first core"
-            default "y" if IDF_TARGET_ESP32S2 || IDF_TARGET_LINUX
             select ESP_SYSTEM_SINGLE_CORE_MODE
             help
                 This version of FreeRTOS normally takes control of all cores of the CPU. Select this if you only want
diff --git a/components/freertos/test_apps/.build-test-rules.yml b/components/freertos/test_apps/.build-test-rules.yml
index 021f5de58f..e4beec33e3 100644
--- a/components/freertos/test_apps/.build-test-rules.yml
+++ b/components/freertos/test_apps/.build-test-rules.yml
@@ -3,6 +3,7 @@
 components/freertos/test_apps/build_tests/freertos_build_test:
   disable:
     - if: CONFIG_NAME == "timers_disabled" and IDF_TARGET != "esp32"
+    - if: CONFIG_NAME == "smp" and IDF_TARGET not in ["esp32"]
   depends_components:
     - freertos
     - esp_system # trigger on changes to idle / tick hooks, wdt, entry point to freertos code
@@ -17,7 +18,7 @@ components/freertos/test_apps/build_tests/orig_inc_path:
 
 components/freertos/test_apps/freertos:
   disable:
-    - if: CONFIG_NAME == "smp" and IDF_TARGET in ["esp32p4", "esp32s31"]
+    - if: CONFIG_NAME == "smp" and IDF_TARGET not in ["esp32"]
       temporary: true
       reason: target(s) not supported yet
     - if: CONFIG_NAME == "psram" and SOC_SPIRAM_SUPPORTED != 1
diff --git a/docs/en/api-reference/system/freertos.rst b/docs/en/api-reference/system/freertos.rst
index bfba0cdcd0..61ecb7cf10 100644
--- a/docs/en/api-reference/system/freertos.rst
+++ b/docs/en/api-reference/system/freertos.rst
@@ -31,7 +31,7 @@ ESP-IDF FreeRTOS is a FreeRTOS implementation based on Vanilla FreeRTOS v10.5.1,
     Amazon SMP FreeRTOS
     ^^^^^^^^^^^^^^^^^^^
 
-    Amazon SMP FreeRTOS is an SMP implementation of FreeRTOS that is officially supported by Amazon. Amazon SMP FreeRTOS is able to support N-cores (i.e., more than two cores). Amazon SMP FreeRTOS can be enabled via the :ref:`CONFIG_FREERTOS_SMP` option. For more details regarding Amazon SMP FreeRTOS, please refer to the `official Amazon SMP FreeRTOS documentation <https://freertos.org/symmetric-multiprocessing-introduction.html>`_.
+    Amazon SMP FreeRTOS is an SMP implementation of FreeRTOS that is officially supported by Amazon. Amazon SMP FreeRTOS is able to support N-cores (i.e., more than two cores). Amazon SMP FreeRTOS can be enabled via the ``CONFIG_FREERTOS_SMP`` option (only available on ESP32). For more details regarding Amazon SMP FreeRTOS, please refer to the `official Amazon SMP FreeRTOS documentation <https://freertos.org/symmetric-multiprocessing-introduction.html>`_.
 
     .. warning::
 
diff --git a/docs/zh_CN/api-reference/system/freertos.rst b/docs/zh_CN/api-reference/system/freertos.rst
index f74e348588..b6b62e08af 100644
--- a/docs/zh_CN/api-reference/system/freertos.rst
+++ b/docs/zh_CN/api-reference/system/freertos.rst
@@ -31,7 +31,7 @@ ESP-IDF FreeRTOS
     Amazon SMP FreeRTOS
     ^^^^^^^^^^^^^^^^^^^
 
-        Amazon SMP FreeRTOS 是由 Amazon 官方支持的 FreeRTOS SMP 实现。Amazon SMP FreeRTOS 能够支持 N 核，即双核以上。通过 :ref:`CONFIG_FREERTOS_SMP` 选项能够启用 Amazon SMP FreeRTOS。关于 Amazon SMP FreeRTOS 的更多细节，请参考 `官方 Amazon SMP FreeRTOS 文档 <https://freertos.org/zh-cn-cmn-s/symmetric-multiprocessing-introduction.html>`__。
+        Amazon SMP FreeRTOS 是由 Amazon 官方支持的 FreeRTOS SMP 实现。Amazon SMP FreeRTOS 能够支持 N 核，即双核以上。通过 ``CONFIG_FREERTOS_SMP`` 选项能够启用 Amazon SMP FreeRTOS（仅适用于 ESP32）。关于 Amazon SMP FreeRTOS 的更多细节，请参考 `官方 Amazon SMP FreeRTOS 文档 <https://freertos.org/zh-cn-cmn-s/symmetric-multiprocessing-introduction.html>`__。
 
         .. warning::