diff --git a/soc/xtensa/esp32/dts_fixup.h b/soc/xtensa/esp32/dts_fixup.h
index 054657d9e71..cc268060dc4 100644
--- a/soc/xtensa/esp32/dts_fixup.h
+++ b/soc/xtensa/esp32/dts_fixup.h
@@ -7,6 +7,6 @@
 /* SoC level DTS fixup file */
 
 #define DT_CPU_CLOCK_FREQUENCY DT_CADENCE_TENSILICA_XTENSA_LX6_0_CLOCK_FREQUENCY
-#define CONFIG_ENTROPY_NAME DT_INST_0_ESPRESSIF_ESP32_TRNG_LABEL
-#define DT_WDT_0_NAME DT_INST_0_ESPRESSIF_ESP32_WATCHDOG_LABEL
+#define CONFIG_ENTROPY_NAME DT_LABEL(DT_INST(0, espressif_esp32_trng))
+#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, espressif_esp32_watchdog))
 /* End of SoC Level DTS fixup file */