diff --git a/target/linux/airoha/dts/an7581-w1700k-ubi-618.dts b/target/linux/airoha/dts/an7581-w1700k-ubi-618.dts
new file mode 100644
index 0000000000..100eb36bb0
--- /dev/null
+++ b/target/linux/airoha/dts/an7581-w1700k-ubi-618.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+/dts-v1/;
+
+#include "an7581-w1700k-ubi.dts"
+
+&phy5 {
+	tx-polarity = <PHY_POL_INVERT>;
+	rx-polarity = <PHY_POL_INVERT>;
+};
+
+&phy8 {
+	tx-polarity = <PHY_POL_INVERT>;
+	rx-polarity = <PHY_POL_INVERT>;
+};
diff --git a/target/linux/airoha/dts/an7581-w1700k-ubi.dts b/target/linux/airoha/dts/an7581-w1700k-ubi.dts
index 42326ec229..de9900f75a 100644
--- a/target/linux/airoha/dts/an7581-w1700k-ubi.dts
+++ b/target/linux/airoha/dts/an7581-w1700k-ubi.dts
@@ -5,6 +5,7 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/phy/phy.h>
 #include "an7581.dtsi"
 #include "an7581-npu-mt7996.dtsi"
 
diff --git a/target/linux/airoha/image/an7581.mk b/target/linux/airoha/image/an7581.mk
index 30a7b6e538..0beed840b6 100644
--- a/target/linux/airoha/image/an7581.mk
+++ b/target/linux/airoha/image/an7581.mk
@@ -96,15 +96,27 @@ define Device/gemtek_w1700k-ubi
   DEVICE_ALT2_VENDOR := Quantum Fiber
   DEVICE_ALT2_MODEL := W1700K
   DEVICE_ALT2_VARIANT := UBI
-  DEVICE_DTS := an7581-w1700k-ubi
+  ifeq ($(KERNEL_PATCHVER),6.18)
+    DEVICE_DTS := an7581-w1700k-ubi-618
+  else
+    DEVICE_DTS := an7581-w1700k-ubi
+  endif
   DEVICE_COMPAT_VERSION := 2.0
   DEVICE_COMPAT_MESSAGE := Partition table has been changed to cooperate \
        with the vendor bootloader with regard to the BMT/BBT partition at \
        the end of flash. A reinstall including corrected chainloader is needed.
-  DEVICE_PACKAGES := airoha-en7581-mt7996-npu-firmware \
-		    fitblk kmod-i2c-an7581 kmod-hwmon-nct7802 \
-		    kmod-mt7996-firmware kmod-phy-rtl8261n \
-		    wpad-basic-mbedtls
+  DEVICE_PACKAGES := airoha-en7581-mt7996-npu-firmware fitblk kmod-i2c-an7581 \
+		    kmod-hwmon-nct7802 kmod-mt7996-firmware wpad-basic-mbedtls
+  ifeq ($(DUMP),1)
+    # HACK adds: both packages to build the config dependency tree
+    DEVICE_PACKAGES += rtl8261n-firmware kmod-phy-rtl8261n
+  else
+    ifeq ($(KERNEL_PATCHVER),6.18)
+      DEVICE_PACKAGES += rtl8261n-firmware
+    else
+      DEVICE_PACKAGES += kmod-phy-rtl8261n
+    endif
+  endif
   UBINIZE_OPTS := -E 5
   BLOCKSIZE := 128k
   PAGESIZE := 2048