diff --git a/nv-platform/Makefile b/nv-platform/Makefile
new file mode 100644
index 0000000..a8cf12f
--- /dev/null
+++ b/nv-platform/Makefile
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+DTC_FLAGS += -@
+
+old-dtb := $(dtb-y)
+old-dtbo := $(dtbo-y)
+dtb-y :=
+dtbo-y :=
+makefile-path := t23x/nv-public/nv-platform
+
+dtb-y += tegra234-p3737-0000+p3701-0000-nv.dtb
+dtb-y += tegra234-p3737-0000+p3701-0004-nv.dtb
+dtb-y += tegra234-p3737-0000+p3701-0005-nv.dtb
+dtb-y += tegra234-p3737-0000+p3701-0008-nv.dtb
+dtb-y += tegra234-p3740-0002+p3701-0008-nv.dtb
+dtb-y += tegra234-p3740-0002+p3701-0008-nv-safety.dtb
+dtb-y += tegra234-p3768-0000+p3767-0000-nv.dtb
+dtb-y += tegra234-p3768-0000+p3767-0001-nv.dtb
+dtb-y += tegra234-p3768-0000+p3767-0003-nv.dtb
+dtb-y += tegra234-p3768-0000+p3767-0004-nv.dtb
+dtb-y += tegra234-p3768-0000+p3767-0005-nv.dtb
+
+ifneq ($(dtb-y),)
+dtb-y := $(addprefix $(makefile-path)/,$(dtb-y))
+endif
+ifneq ($(dtbo-y),)
+dtbo-y := $(addprefix $(makefile-path)/,$(dtbo-y))
+endif
+
+dtb-y += $(old-dtb)
+dtbo-y += $(old-dtbo)
+
diff --git a/overlay/tegra234-camera-p3785.dtsi b/nv-platform/tegra234-camera-p3785.dtsi
similarity index 100%
rename from overlay/tegra234-camera-p3785.dtsi
rename to nv-platform/tegra234-camera-p3785.dtsi
diff --git a/overlay/tegra234-dcb-p3737-0000-p3701-0000.dtsi b/nv-platform/tegra234-dcb-p3737-0000-p3701-0000.dtsi
similarity index 100%
rename from overlay/tegra234-dcb-p3737-0000-p3701-0000.dtsi
rename to nv-platform/tegra234-dcb-p3737-0000-p3701-0000.dtsi
diff --git a/overlay/tegra234-p3701-0000-prod-overlay.dtsi b/nv-platform/tegra234-p3701-0000-prod-overlay.dtsi
similarity index 100%
rename from overlay/tegra234-p3701-0000-prod-overlay.dtsi
rename to nv-platform/tegra234-p3701-0000-prod-overlay.dtsi
diff --git a/overlay/tegra234-p3701-0000.dtsi b/nv-platform/tegra234-p3701-0000.dtsi
similarity index 100%
rename from overlay/tegra234-p3701-0000.dtsi
rename to nv-platform/tegra234-p3701-0000.dtsi
diff --git a/overlay/tegra234-p3701-0008.dtsi b/nv-platform/tegra234-p3701-0008.dtsi
similarity index 100%
rename from overlay/tegra234-p3701-0008.dtsi
rename to nv-platform/tegra234-p3701-0008.dtsi
diff --git a/nv-platform/tegra234-p3737-0000+p3701-0000-nv.dts b/nv-platform/tegra234-p3737-0000+p3701-0000-nv.dts
new file mode 100644
index 0000000..ac940c0
--- /dev/null
+++ b/nv-platform/tegra234-p3737-0000+p3701-0000-nv.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "tegra234-p3737-0000+p3701-0000.dts"
+#include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi"
diff --git a/nv-platform/tegra234-p3737-0000+p3701-0004-nv.dts b/nv-platform/tegra234-p3737-0000+p3701-0004-nv.dts
new file mode 100644
index 0000000..2c2ee2d
--- /dev/null
+++ b/nv-platform/tegra234-p3737-0000+p3701-0004-nv.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "staging/tegra234-p3737-0000+p3701-0004.dts"
+#include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi"
diff --git a/nv-platform/tegra234-p3737-0000+p3701-0005-nv.dts b/nv-platform/tegra234-p3737-0000+p3701-0005-nv.dts
new file mode 100644
index 0000000..7c22bcf
--- /dev/null
+++ b/nv-platform/tegra234-p3737-0000+p3701-0005-nv.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "staging/tegra234-p3737-0000+p3701-0005.dts"
+#include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi"
diff --git a/nv-platform/tegra234-p3737-0000+p3701-0008-nv.dts b/nv-platform/tegra234-p3737-0000+p3701-0008-nv.dts
new file mode 100644
index 0000000..256e8c7
--- /dev/null
+++ b/nv-platform/tegra234-p3737-0000+p3701-0008-nv.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "staging/tegra234-p3737-0000+p3701-0008.dts"
+#include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi"
diff --git a/overlay/tegra234-p3737-0000+p3701-0000.dts b/nv-platform/tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi
similarity index 94%
rename from overlay/tegra234-p3737-0000+p3701-0000.dts
rename to nv-platform/tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi
index b11502b..969a131 100644
--- a/overlay/tegra234-p3737-0000+p3701-0000.dts
+++ b/nv-platform/tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi
@@ -1,16 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
-
-/dts-v1/;
-/plugin/;
-
-#include "tegra234-overlay.dtsi"
-#include "tegra234-soc-thermal.dtsi"
-#include "tegra234-soc-thermal-slowdown-cluster.dtsi"
-#include "tegra234-soc-thermal-shutdown.dtsi"
-#include "tegra234-soc-audio-dai-links.dtsi"
-#include "tegra234-soc-camera.dtsi"
+#include "nv-soc/tegra234-overlay.dtsi"
+#include "nv-soc/tegra234-soc-thermal.dtsi"
+#include "nv-soc/tegra234-soc-thermal-slowdown-cluster.dtsi"
+#include "nv-soc/tegra234-soc-thermal-shutdown.dtsi"
+#include "nv-soc/tegra234-soc-audio-dai-links.dtsi"
+#include "nv-soc/tegra234-soc-camera.dtsi"
 #include "tegra234-p3737-0000.dtsi"
 #include "tegra234-p3701-0000.dtsi"
 #include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"
diff --git a/overlay/tegra234-p3737-0000.dtsi b/nv-platform/tegra234-p3737-0000.dtsi
similarity index 100%
rename from overlay/tegra234-p3737-0000.dtsi
rename to nv-platform/tegra234-p3737-0000.dtsi
diff --git a/overlay/tegra234-p3740-0002+p3701-0008.dts b/nv-platform/tegra234-p3740-0002+p3701-0008-nv-common.dtsi
similarity index 94%
rename from overlay/tegra234-p3740-0002+p3701-0008.dts
rename to nv-platform/tegra234-p3740-0002+p3701-0008-nv-common.dtsi
index 01efc77..d536bac 100644
--- a/overlay/tegra234-p3740-0002+p3701-0008.dts
+++ b/nv-platform/tegra234-p3740-0002+p3701-0008-nv-common.dtsi
@@ -1,14 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
-/dts-v1/;
-/plugin/;
-
-#include "tegra234-overlay.dtsi"
-#include "tegra234-soc-thermal.dtsi"
-#include "tegra234-soc-thermal-slowdown-cluster.dtsi"
-#include "tegra234-soc-thermal-shutdown.dtsi"
-#include "tegra234-soc-camera.dtsi"
+#include "nv-soc/tegra234-overlay.dtsi"
+#include "nv-soc/tegra234-soc-thermal.dtsi"
+#include "nv-soc/tegra234-soc-thermal-slowdown-cluster.dtsi"
+#include "nv-soc/tegra234-soc-thermal-shutdown.dtsi"
+#include "nv-soc/tegra234-soc-camera.dtsi"
 #include "tegra234-camera-p3785.dtsi"
 #include "tegra234-p3740-0002.dtsi"
 #include "tegra234-p3701-0008.dtsi"
diff --git a/nv-platform/tegra234-p3740-0002+p3701-0008-nv-safety.dts b/nv-platform/tegra234-p3740-0002+p3701-0008-nv-safety.dts
new file mode 100644
index 0000000..1122442
--- /dev/null
+++ b/nv-platform/tegra234-p3740-0002+p3701-0008-nv-safety.dts
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "tegra234-p3740-0002+p3701-0008.dts"
+#include "tegra234-p3740-0002+p3701-0008-nv-common.dtsi"
+#include "tegra234-p3740-0002+p3701-0008-safety.dtsi"
diff --git a/nv-platform/tegra234-p3740-0002+p3701-0008-nv.dts b/nv-platform/tegra234-p3740-0002+p3701-0008-nv.dts
new file mode 100644
index 0000000..bfae4a2
--- /dev/null
+++ b/nv-platform/tegra234-p3740-0002+p3701-0008-nv.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "tegra234-p3740-0002+p3701-0008.dts"
+#include "tegra234-p3740-0002+p3701-0008-nv-common.dtsi"
diff --git a/overlay/tegra234-p3740-0002+p3701-0008-safety.dts b/nv-platform/tegra234-p3740-0002+p3701-0008-safety.dtsi
similarity index 98%
rename from overlay/tegra234-p3740-0002+p3701-0008-safety.dts
rename to nv-platform/tegra234-p3740-0002+p3701-0008-safety.dtsi
index 0fcb904..0eae016 100644
--- a/overlay/tegra234-p3740-0002+p3701-0008-safety.dts
+++ b/nv-platform/tegra234-p3740-0002+p3701-0008-safety.dtsi
@@ -1,10 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 // SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
-/dts-v1/;
-/plugin/;
-
-#include "tegra234-soc-safetyservice-fsicom.dtsi"
+#include "nv-soc/tegra234-soc-safetyservice-fsicom.dtsi"
 
 / {
 #ifndef REMOVE_FRAGMENT_SYNTAX
diff --git a/overlay/tegra234-p3740-0002.dtsi b/nv-platform/tegra234-p3740-0002.dtsi
similarity index 99%
rename from overlay/tegra234-p3740-0002.dtsi
rename to nv-platform/tegra234-p3740-0002.dtsi
index 5162a0c..07e5d66 100644
--- a/overlay/tegra234-p3740-0002.dtsi
+++ b/nv-platform/tegra234-p3740-0002.dtsi
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
-#include "tegra234-soc-audio-dai-links.dtsi"
+#include "nv-soc/tegra234-soc-audio-dai-links.dtsi"
 
 / {
 #ifndef REMOVE_FRAGMENT_SYNTAX
diff --git a/overlay/tegra234-p3767-0000.dtsi b/nv-platform/tegra234-p3767-0000.dtsi
similarity index 100%
rename from overlay/tegra234-p3767-0000.dtsi
rename to nv-platform/tegra234-p3767-0000.dtsi
diff --git a/nv-platform/tegra234-p3768-0000+p3767-0000-nv.dts b/nv-platform/tegra234-p3768-0000+p3767-0000-nv.dts
new file mode 100644
index 0000000..29f2efe
--- /dev/null
+++ b/nv-platform/tegra234-p3768-0000+p3767-0000-nv.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "tegra234-p3768-0000+p3767-0000.dts"
+#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"
diff --git a/nv-platform/tegra234-p3768-0000+p3767-0001-nv.dts b/nv-platform/tegra234-p3768-0000+p3767-0001-nv.dts
new file mode 100644
index 0000000..2a0a92d
--- /dev/null
+++ b/nv-platform/tegra234-p3768-0000+p3767-0001-nv.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "staging/tegra234-p3768-0000+p3767-0001.dts"
+#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"
diff --git a/nv-platform/tegra234-p3768-0000+p3767-0003-nv.dts b/nv-platform/tegra234-p3768-0000+p3767-0003-nv.dts
new file mode 100644
index 0000000..000c803
--- /dev/null
+++ b/nv-platform/tegra234-p3768-0000+p3767-0003-nv.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "staging/tegra234-p3768-0000+p3767-0003.dts"
+#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"
diff --git a/nv-platform/tegra234-p3768-0000+p3767-0004-nv.dts b/nv-platform/tegra234-p3768-0000+p3767-0004-nv.dts
new file mode 100644
index 0000000..69c37a7
--- /dev/null
+++ b/nv-platform/tegra234-p3768-0000+p3767-0004-nv.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "staging/tegra234-p3768-0000+p3767-0004.dts"
+#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"
diff --git a/nv-platform/tegra234-p3768-0000+p3767-0005-nv.dts b/nv-platform/tegra234-p3768-0000+p3767-0005-nv.dts
new file mode 100644
index 0000000..2b68cf6
--- /dev/null
+++ b/nv-platform/tegra234-p3768-0000+p3767-0005-nv.dts
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "tegra234-p3768-0000+p3767-0005.dts"
+#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"
diff --git a/overlay/tegra234-p3768-0000+p3767-0000.dts b/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi
similarity index 96%
rename from overlay/tegra234-p3768-0000+p3767-0000.dts
rename to nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi
index 60169ac..a7632d7 100644
--- a/overlay/tegra234-p3768-0000+p3767-0000.dts
+++ b/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi
@@ -1,17 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
-/dts-v1/;
-/plugin/;
-
-#include "tegra234-overlay.dtsi"
-#include "tegra234-soc-thermal.dtsi"
-#include "tegra234-soc-thermal-slowdown-corepair.dtsi"
-#include "tegra234-soc-thermal-shutdown.dtsi"
-#include "tegra234-soc-audio-dai-links.dtsi"
+#include "nv-soc/tegra234-overlay.dtsi"
+#include "nv-soc/tegra234-soc-thermal.dtsi"
+#include "nv-soc/tegra234-soc-thermal-slowdown-corepair.dtsi"
+#include "nv-soc/tegra234-soc-thermal-shutdown.dtsi"
+#include "nv-soc/tegra234-soc-audio-dai-links.dtsi"
 #include "tegra234-p3768-0000.dtsi"
 #include "tegra234-p3767-0000.dtsi"
-#include "tegra234-soc-camera.dtsi"
+#include "nv-soc/tegra234-soc-camera.dtsi"
 #include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"
 / {
 #ifndef REMOVE_FRAGMENT_SYNTAX
diff --git a/overlay/tegra234-p3768-0000.dtsi b/nv-platform/tegra234-p3768-0000.dtsi
similarity index 100%
rename from overlay/tegra234-p3768-0000.dtsi
rename to nv-platform/tegra234-p3768-0000.dtsi
diff --git a/overlay/tegra234-base-overlay.dtsi b/nv-soc/tegra234-base-overlay.dtsi
similarity index 100%
rename from overlay/tegra234-base-overlay.dtsi
rename to nv-soc/tegra234-base-overlay.dtsi
diff --git a/overlay/tegra234-overlay.dtsi b/nv-soc/tegra234-overlay.dtsi
similarity index 100%
rename from overlay/tegra234-overlay.dtsi
rename to nv-soc/tegra234-overlay.dtsi
diff --git a/overlay/tegra234-soc-audio-dai-links.dtsi b/nv-soc/tegra234-soc-audio-dai-links.dtsi
similarity index 100%
rename from overlay/tegra234-soc-audio-dai-links.dtsi
rename to nv-soc/tegra234-soc-audio-dai-links.dtsi
diff --git a/overlay/tegra234-soc-camera.dtsi b/nv-soc/tegra234-soc-camera.dtsi
similarity index 100%
rename from overlay/tegra234-soc-camera.dtsi
rename to nv-soc/tegra234-soc-camera.dtsi
diff --git a/overlay/tegra234-soc-display-overlay.dtsi b/nv-soc/tegra234-soc-display-overlay.dtsi
similarity index 100%
rename from overlay/tegra234-soc-display-overlay.dtsi
rename to nv-soc/tegra234-soc-display-overlay.dtsi
diff --git a/overlay/tegra234-soc-overlay.dtsi b/nv-soc/tegra234-soc-overlay.dtsi
similarity index 100%
rename from overlay/tegra234-soc-overlay.dtsi
rename to nv-soc/tegra234-soc-overlay.dtsi
diff --git a/overlay/tegra234-soc-prod-overlay.dtsi b/nv-soc/tegra234-soc-prod-overlay.dtsi
similarity index 100%
rename from overlay/tegra234-soc-prod-overlay.dtsi
rename to nv-soc/tegra234-soc-prod-overlay.dtsi
diff --git a/overlay/tegra234-soc-safetyservice-fsicom.dtsi b/nv-soc/tegra234-soc-safetyservice-fsicom.dtsi
similarity index 100%
rename from overlay/tegra234-soc-safetyservice-fsicom.dtsi
rename to nv-soc/tegra234-soc-safetyservice-fsicom.dtsi
diff --git a/overlay/tegra234-soc-thermal-shutdown.dtsi b/nv-soc/tegra234-soc-thermal-shutdown.dtsi
similarity index 100%
rename from overlay/tegra234-soc-thermal-shutdown.dtsi
rename to nv-soc/tegra234-soc-thermal-shutdown.dtsi
diff --git a/overlay/tegra234-soc-thermal-slowdown-cluster.dtsi b/nv-soc/tegra234-soc-thermal-slowdown-cluster.dtsi
similarity index 100%
rename from overlay/tegra234-soc-thermal-slowdown-cluster.dtsi
rename to nv-soc/tegra234-soc-thermal-slowdown-cluster.dtsi
diff --git a/overlay/tegra234-soc-thermal-slowdown-corepair.dtsi b/nv-soc/tegra234-soc-thermal-slowdown-corepair.dtsi
similarity index 100%
rename from overlay/tegra234-soc-thermal-slowdown-corepair.dtsi
rename to nv-soc/tegra234-soc-thermal-slowdown-corepair.dtsi
diff --git a/overlay/tegra234-soc-thermal.dtsi b/nv-soc/tegra234-soc-thermal.dtsi
similarity index 100%
rename from overlay/tegra234-soc-thermal.dtsi
rename to nv-soc/tegra234-soc-thermal.dtsi
diff --git a/overlay/Makefile b/overlay/Makefile
index ba78a77..e3d1dc3 100644
--- a/overlay/Makefile
+++ b/overlay/Makefile
@@ -14,12 +14,8 @@ dtbo-y += tegra234-android.dtbo
 dtbo-y += tegra234-audio-overlay.dtbo
 dtbo-y += tegra234-carveouts.dtbo
 dtbo-y += tegra234-jetson.dtbo
-dtbo-y += tegra234-p3737-0000+p3701-0000.dtbo
 dtbo-y += tegra234-p3737-0000+p3701-0000-pcie-no-tra.dtbo
 dtbo-y += tegra234-p3737-0000+p3701-0000-dynamic.dtbo
-dtbo-y += tegra234-p3740-0002+p3701-0008.dtbo
-dtbo-y += tegra234-p3740-0002+p3701-0008-safety.dtbo
-dtbo-y += tegra234-p3768-0000+p3767-0000.dtbo
 dtbo-y += tegra234-p3768-0000+p3767-0000-dynamic.dtbo
 dtbo-y += tegra234-p3737-0000+p3701-0000-audio-adafruit-uda1334a.dtbo
 dtbo-y += tegra234-p3737-0000+p3701-0000-audio-adafruit-sph0645lm4h.dtbo
diff --git a/overlay/tegra234-jetson.dts b/overlay/tegra234-jetson.dts
index f2e0e7f..b24bdce 100644
--- a/overlay/tegra234-jetson.dts
+++ b/overlay/tegra234-jetson.dts
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-// Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+// SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
 /dts-v1/;
 /plugin/;
@@ -11,8 +11,8 @@
 #include <dt-bindings/memory/tegra234-mc.h>
 #include <dt-bindings/power/tegra234-powergate.h>
 #include <dt-bindings/reset/tegra234-reset.h>
-#include "tegra234-soc-display-overlay.dtsi"
-#include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"
+#include "nv-soc/tegra234-soc-display-overlay.dtsi"
+#include "nv-platform/tegra234-dcb-p3737-0000-p3701-0000.dtsi"
 
 / {
 	overlay-name = "Tegra234 Jetson Overlay";