diff --git a/qcom/Makefile b/qcom/Makefile
index 8f6252b9e453..df48d68e3d40 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -92,13 +92,11 @@ blair-milanf-evb2-overlay.dtbo-base := blair-moto-base.dtb
 blair-milanf-dvt1-overlay.dtbo-base := blair-moto-base.dtb
 
 dtbo-$(CONFIG_RHODEP_DTB) += \
-        blair-rhodep-evb1-overlay.dtbo \
-        blair-rhodep-evb2-overlay.dtbo \
-        blair-rhodep-dvt1-overlay.dtbo
+        blair-rhodep-evb-overlay.dtbo \
+        blair-rhodep-evt-overlay.dtbo \
 
-blair-rhodep-evb1-overlay.dtbo-base := blair-moto-base.dtb
-blair-rhodep-evb2-overlay.dtbo-base := blair-moto-base.dtb
-blair-rhodep-dvt1-overlay.dtbo-base := blair-moto-base.dtb
+blair-rhodep-evb-overlay.dtbo-base := blair-moto-base.dtb
+blair-rhodep-evt-overlay.dtbo-base := blair-moto-base.dtb
 
 
 else
diff --git a/qcom/blair-nopmi-rhodep-common-overlay.dtsi b/qcom/blair-nopmi-rhodep-common-overlay.dtsi
deleted file mode 100644
index 375110d2af50..000000000000
--- a/qcom/blair-nopmi-rhodep-common-overlay.dtsi
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (c) 2021, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-#include "blair-rhodep-common-overlay.dtsi"
-#include "blair-nopmi-moto-common-overlay.dtsi"
-#include "tcpc_config.dtsi"
-#include "sgm7220.dtsi"
-#include "rt9426a.dtsi"
-#include "discrete_charging.dtsi"
-
-&usb0 {
-       qcom,force-adb-enable;
-};
-
-
-&qupv3_se8_i2c {
-	status = "okay";
-	cw2217@64 {
-		compatible = "cellwise,cw2217";
-		reg = <0x64>;
-		status = "okay";
-
-		df-serialnum = "SB18D33989";
-		#include "bat_setting/CW_md50-scud-5000mah.dtsi"
-		#include "bat_setting/CW_md50-amperex-5000mah.dtsi"
-	};
-};
-
diff --git a/qcom/blair-pm6125-rhodep-common-overlay.dtsi b/qcom/blair-pm6125-rhodep-common-overlay.dtsi
deleted file mode 100644
index e0bc0a29bae0..000000000000
--- a/qcom/blair-pm6125-rhodep-common-overlay.dtsi
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright (c) 2021, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-#include "blair-rhodep-common-overlay.dtsi"
-#include "blair-pm6125-moto-common-overlay.dtsi"
-
-&pm7250b_charger {
-	dpdm-supply = <&usb2_phy0>;
-};
-
-&smb1394 {
-	status = "disabled";
-};
diff --git a/qcom/blair-rhodep-common-overlay.dtsi b/qcom/blair-rhodep-common-overlay.dtsi
index 458d113c8c74..5141bc488c20 100644
--- a/qcom/blair-rhodep-common-overlay.dtsi
+++ b/qcom/blair-rhodep-common-overlay.dtsi
@@ -9,6 +9,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+#include "blair-nopmi-moto-common-overlay.dtsi"
+
 #include "holi-audio-wcd9370-aw882xx-acf-overlay.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/linux-event-codes.h>
@@ -22,6 +24,23 @@
 #include "rhodep-sensors.dtsi"
 #include "camera/blair-camera-sensor-mot-rhodep-overlay.dtsi"
 #include "rhodep-wl286xx.dtsi"
+#include "tcpc_config.dtsi"
+#include "sgm7220.dtsi"
+#include "rt9426a.dtsi"
+#include "discrete_charging.dtsi"
+
+&qupv3_se8_i2c {
+	status = "okay";
+	cw2217@64 {
+		compatible = "cellwise,cw2217";
+		reg = <0x64>;
+		status = "okay";
+
+		df-serialnum = "SB18D33989";
+		#include "bat_setting/CW_md50-scud-5000mah.dtsi"
+		#include "bat_setting/CW_md50-amperex-5000mah.dtsi"
+	};
+};
 
 &wcd937x_codec {
 	cdc-vdd-rxtx-supply = <&L9A>;
diff --git a/qcom/blair-rhodep-evb2-overlay.dts b/qcom/blair-rhodep-evb-overlay.dts
similarity index 89%
rename from qcom/blair-rhodep-evb2-overlay.dts
rename to qcom/blair-rhodep-evb-overlay.dts
index a034d114bb21..17c4ec8f41fc 100644
--- a/qcom/blair-rhodep-evb2-overlay.dts
+++ b/qcom/blair-rhodep-evb-overlay.dts
@@ -13,12 +13,12 @@
 /dts-v1/;
 /plugin/;
 
-#include "blair-nopmi-rhodep-common-overlay.dtsi"
+#include "blair-rhodep-common-overlay.dtsi"
 
 / {
 	model = "rhodep";
 	compatible = "qcom,blair-rhodep", "qcom,blair-moto", "qcom,blair";
 	qcom,msm-id = <507 0x10000>;
-	qcom,board-id = <0x49 0xA200>;
+	qcom,board-id = <0x4D 0xA100>;
 };
 
diff --git a/qcom/blair-rhodep-evb1-overlay.dts b/qcom/blair-rhodep-evb1-overlay.dts
deleted file mode 100644
index 5a2b1da5c7ef..000000000000
--- a/qcom/blair-rhodep-evb1-overlay.dts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (c) 2021, The Linux Foundation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-/dts-v1/;
-/plugin/;
-
-#include "blair-pm6125-rhodep-common-overlay.dtsi"
-
-/ {
-	model = "rhodep";
-	compatible = "qcom,blair-rhodep", "qcom,blair-moto", "qcom,blair";
-	qcom,msm-id = <507 0x10000>;
-	qcom,board-id = <0x49 0xA100>;
-};
-
diff --git a/qcom/blair-rhodep-dvt1-overlay.dts b/qcom/blair-rhodep-evt-overlay.dts
similarity index 89%
rename from qcom/blair-rhodep-dvt1-overlay.dts
rename to qcom/blair-rhodep-evt-overlay.dts
index 888b505195b2..1adc5ea43232 100644
--- a/qcom/blair-rhodep-dvt1-overlay.dts
+++ b/qcom/blair-rhodep-evt-overlay.dts
@@ -13,12 +13,12 @@
 /dts-v1/;
 /plugin/;
 
-#include "blair-nopmi-rhodep-common-overlay.dtsi"
+#include "blair-rhodep-common-overlay.dtsi"
 
 / {
 	model = "rhodep";
 	compatible = "qcom,blair-rhodep", "qcom,blair-moto", "qcom,blair";
 	qcom,msm-id = <507 0x10000>;
-	qcom,board-id = <0x49 0xB100>;
+	qcom,board-id = <0x4D 0xA200>;
 };