diff --git a/components/freertos/config/include/freertos/FreeRTOSConfig.h b/components/freertos/config/include/freertos/FreeRTOSConfig.h
index 33dc30f49f..623272fbc3 100644
--- a/components/freertos/config/include/freertos/FreeRTOSConfig.h
+++ b/components/freertos/config/include/freertos/FreeRTOSConfig.h
@@ -90,6 +90,7 @@
 #endif /* configUSE_TICKLESS_IDLE */
 #define configCPU_CLOCK_HZ                           ( CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ * 1000000 )
 #define configTICK_RATE_HZ                           CONFIG_FREERTOS_HZ
+#define configMAX_PRIORITIES                         ( 25 )
 #define configUSE_TIME_SLICING                       1
 #define configUSE_16_BIT_TICKS                       0
 #define configIDLE_SHOULD_YIELD                      0
@@ -171,11 +172,11 @@
 
 /* ------------------- Software Timer ---------------------- */
 
-#define configUSE_TIMERS                1
-#define configTIMER_TASK_PRIORITY       CONFIG_FREERTOS_TIMER_TASK_PRIORITY
-#define configTIMER_QUEUE_LENGTH        CONFIG_FREERTOS_TIMER_QUEUE_LENGTH
-#define configTIMER_TASK_STACK_DEPTH    CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH
-#define configTIMER_SERVICE_TASK_NAME   CONFIG_FREERTOS_TIMER_SERVICE_TASK_NAME
+#define configUSE_TIMERS                 1
+#define configTIMER_TASK_PRIORITY        CONFIG_FREERTOS_TIMER_TASK_PRIORITY
+#define configTIMER_QUEUE_LENGTH         CONFIG_FREERTOS_TIMER_QUEUE_LENGTH
+#define configTIMER_TASK_STACK_DEPTH     CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH
+#define configTIMER_SERVICE_TASK_NAME    CONFIG_FREERTOS_TIMER_SERVICE_TASK_NAME
 
 /* -------------------- API Includes ----------------------- */
 
diff --git a/components/freertos/config/linux/include/freertos/FreeRTOSConfig_arch.h b/components/freertos/config/linux/include/freertos/FreeRTOSConfig_arch.h
index bd0276b06b..8c356eb4bc 100644
--- a/components/freertos/config/linux/include/freertos/FreeRTOSConfig_arch.h
+++ b/components/freertos/config/linux/include/freertos/FreeRTOSConfig_arch.h
@@ -18,7 +18,6 @@
 
 /* ------------------ Scheduler Related -------------------- */
 
-#define configMAX_PRIORITIES                       ( 7 )
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION    0
 
 /* The stack allocated by FreeRTOS will be passed to a pthread.
@@ -32,7 +31,7 @@
 /* ---------------- Amazon SMP FreeRTOS -------------------- */
 
 #if CONFIG_FREERTOS_SMP
-    #define configUSE_MINIMAL_IDLE_HOOK              0   // Not implemented yet, TODO IDF-6654
+    #define configUSE_MINIMAL_IDLE_HOOK    0             /* Not implemented yet, TODO IDF-6654 */
 #endif
 
 /* ----------------------- System -------------------------- */
@@ -53,8 +52,8 @@
 /* -------------------- API Includes ----------------------- */
 
 /* Todo: Reconcile INCLUDE_option differences (IDF-8186) */
-#define INCLUDE_vTaskDelayUntil              1
-#define INCLUDE_uxTaskGetStackHighWaterMark2 0
+#define INCLUDE_vTaskDelayUntil                 1
+#define INCLUDE_uxTaskGetStackHighWaterMark2    0
 
 /* ------------------------------------------------ ESP-IDF Additions --------------------------------------------------
  *
diff --git a/components/freertos/config/riscv/include/freertos/FreeRTOSConfig_arch.h b/components/freertos/config/riscv/include/freertos/FreeRTOSConfig_arch.h
index 670ee6d290..b46fbbb4fa 100644
--- a/components/freertos/config/riscv/include/freertos/FreeRTOSConfig_arch.h
+++ b/components/freertos/config/riscv/include/freertos/FreeRTOSConfig_arch.h
@@ -16,7 +16,6 @@
 
 /* ------------------ Scheduler Related -------------------- */
 
-#define configMAX_PRIORITIES                           ( 25 )
 #ifdef CONFIG_FREERTOS_OPTIMIZED_SCHEDULER
     #define configUSE_PORT_OPTIMISED_TASK_SELECTION    1
 #else
diff --git a/components/freertos/config/xtensa/include/freertos/FreeRTOSConfig_arch.h b/components/freertos/config/xtensa/include/freertos/FreeRTOSConfig_arch.h
index f54952c83f..0b3b1c8161 100644
--- a/components/freertos/config/xtensa/include/freertos/FreeRTOSConfig_arch.h
+++ b/components/freertos/config/xtensa/include/freertos/FreeRTOSConfig_arch.h
@@ -43,7 +43,6 @@
 
 /* ------------------ Scheduler Related -------------------- */
 
-#define configMAX_PRIORITIES                           ( 25 )
 #ifdef CONFIG_FREERTOS_OPTIMIZED_SCHEDULER
     #define configUSE_PORT_OPTIMISED_TASK_SELECTION    1
 #else