diff --git a/BUILD_BVF_GATEWARE.tcl b/BUILD_BVF_GATEWARE.tcl
index 963a9742bd93c5bc2a26934b890e6401b717dd48..2b438c431fda98f737af3fd8513433548a179d39 100644
--- a/BUILD_BVF_GATEWARE.tcl
+++ b/BUILD_BVF_GATEWARE.tcl
@@ -89,14 +89,14 @@ puts "M.2 option selected: $m2_option"
 if {[info exists HIGH_SPEED_CONN_OPTION]} {
     set high_speed_conn_option "$HIGH_SPEED_CONN_OPTION"
 } else {
-    set high_speed_conn_option "NONE"
+    set high_speed_conn_option "DEFAULT"
 }
 puts "High speed connector option option selected: $high_speed_conn_option"
 
 if {[info exists MIPI_CSI_OPTION]} {
     set mipi_csi_option "$MIPI_CSI_OPTION"
 } else {
-    set mipi_csi_option "NONE"
+    set mipi_csi_option "DEFAULT"
 }
 puts "MIPI CSI option option selected: $mipi_csi_option"
 
diff --git a/script_support/components/HIGH_SPEED_CONNECTOR/DEFAULT/ADD_HIGH_SPEED_CONNECTOR.tcl b/script_support/components/HIGH_SPEED_CONNECTOR/DEFAULT/ADD_HIGH_SPEED_CONNECTOR.tcl
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/script_support/components/HIGH_SPEED_CONNECTOR/DEFAULT/constraints/HIGH_SPEED_CONNECTOR.pdc b/script_support/components/HIGH_SPEED_CONNECTOR/DEFAULT/constraints/HIGH_SPEED_CONNECTOR.pdc
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/script_support/components/MIPI_CSI/DEFAULT/ADD_MIPI_CSI_INTERFACE.tcl b/script_support/components/MIPI_CSI/DEFAULT/ADD_MIPI_CSI_INTERFACE.tcl
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/script_support/components/MIPI_CSI/DEFAULT/constraints/MIPI_CSI_INTERFACE.pdc b/script_support/components/MIPI_CSI/DEFAULT/constraints/MIPI_CSI_INTERFACE.pdc
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391