diff --git a/Kconfig b/Kconfig
index 182adbbb60c7cc3d5b9cb04f3376196d3e6c997a..9419e6fae73de6b3e14571793c38179d2c6713b7 100644
--- a/Kconfig
+++ b/Kconfig
@@ -3,6 +3,11 @@ menu "Arduino Configuration"
 config ENABLE_ARDUINO_DEPENDS
     bool
     select LWIP_SO_RCVBUF
+    select BT_ENABLED
+    select ETHERNET
+    select WIFI_ENABLED
+    select ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
+    select MEMMAP_SMP
     default "y"
 
 config AUTOSTART_ARDUINO
diff --git a/cores/esp32/main.cpp b/cores/esp32/main.cpp
index c2300b41d9e22986e95051bf0e323605ccdca18a..e2192c3bb40914ddda5ad3cfcdb5673d85652abb 100644
--- a/cores/esp32/main.cpp
+++ b/cores/esp32/main.cpp
@@ -4,6 +4,12 @@
 
 #if CONFIG_AUTOSTART_ARDUINO
 
+#if CONFIG_FREERTOS_UNICORE
+#define ARDUINO_RUNNING_CORE 0
+#else
+#define ARDUINO_RUNNING_CORE 1
+#endif
+
 void loopTask(void *pvParameters)
 {
     setup();
@@ -15,7 +21,7 @@ void loopTask(void *pvParameters)
 extern "C" void app_main()
 {
     initArduino();
-    xTaskCreatePinnedToCore(loopTask, "loopTask", 4096, NULL, 1, NULL, 1);
+    xTaskCreatePinnedToCore(loopTask, "loopTask", 4096, NULL, 1, NULL, ARDUINO_RUNNING_CORE);
 }
 
 #endif