diff --git a/script_support/components/M2/BOARD_TESTS/M2_INTERFACE.tcl b/script_support/components/M2/BOARD_TESTS/M2_INTERFACE.tcl
index e0838363a6bbf2b75c6230cbd947f26085f0e2c0..522c7f654c283b0dc008cf4204fbff93672ccc22 100644
--- a/script_support/components/M2/BOARD_TESTS/M2_INTERFACE.tcl
+++ b/script_support/components/M2/BOARD_TESTS/M2_INTERFACE.tcl
@@ -43,6 +43,13 @@ sd_create_bif_port -sd_name ${sd_name} -port_name {APB_TARGET} -port_bif_vlnv {A
 
 # Add CoreGPIO_M2_0 instance
 sd_instantiate_component -sd_name ${sd_name} -component_name {CoreGPIO_M2} -instance_name {CoreGPIO_M2_0}
+sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_IN} -pin_slices {[0:0]}
+sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_IN} -pin_slices {[1:1]}
+sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_IN} -pin_slices {[2:2]}
+sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_IN} -pin_slices {[3:3]}
+sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_IN} -pin_slices {[4:4]}
+sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_IN} -pin_slices {[5:5]}
+sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_IN} -pin_slices {[6:6]}
 sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_OUT} -pin_slices {[0:0]}
 sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_OUT} -pin_slices {[1:1]}
 sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_OUT} -pin_slices {[2:2]}
@@ -51,19 +58,18 @@ sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_OUT} -pin
 sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_OUT} -pin_slices {[5:5]}
 sd_create_pin_slices -sd_name ${sd_name} -pin_name {CoreGPIO_M2_0:GPIO_OUT} -pin_slices {[6:6]}
 sd_mark_pins_unused -sd_name ${sd_name} -pin_names {CoreGPIO_M2_0:INT}
-sd_connect_pins_to_constant -sd_name ${sd_name} -pin_names {CoreGPIO_M2_0:GPIO_IN} -value {VCC}
 sd_mark_pins_unused -sd_name ${sd_name} -pin_names {CoreGPIO_M2_0:GPIO_OE}
 
 
 
 # Add scalar net connections
-sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_OUT[0:0]" "M2_PERST0n" }
-sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_OUT[1:1]" "M2_UART_WAKEN" }
-sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_OUT[2:2]" "M2_W_DISABLE1" }
-sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_OUT[3:3]" "M2_W_DISABLE2" }
-sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_OUT[4:4]" "H_M2_CLKREQ0N" }
-sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_OUT[5:5]" "M2_PEWAKEN" }
-sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_OUT[6:6]" "M2_I2C_ALTN" }
+sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_IN[0:0]" "CoreGPIO_M2_0:GPIO_OUT[0:0]" "M2_PERST0n" }
+sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_IN[1:1]" "CoreGPIO_M2_0:GPIO_OUT[1:1]" "M2_UART_WAKEN" }
+sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_IN[2:2]" "CoreGPIO_M2_0:GPIO_OUT[2:2]" "M2_W_DISABLE1" }
+sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_IN[3:3]" "CoreGPIO_M2_0:GPIO_OUT[3:3]" "M2_W_DISABLE2" }
+sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_IN[4:4]" "CoreGPIO_M2_0:GPIO_OUT[4:4]" "H_M2_CLKREQ0N" }
+sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_IN[5:5]" "CoreGPIO_M2_0:GPIO_OUT[5:5]" "M2_PEWAKEN" }
+sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:GPIO_IN[6:6]" "CoreGPIO_M2_0:GPIO_OUT[6:6]" "M2_I2C_ALTN" }
 sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:PCLK" "PCLK" }
 sd_connect_pins -sd_name ${sd_name} -pin_names {"CoreGPIO_M2_0:PRESETN" "PRESETN" }
 
diff --git a/script_support/components/M2/BOARD_TESTS/device-tree-overlay/pcie.dtso b/script_support/components/M2/BOARD_TESTS/device-tree-overlay/pcie.dtso
index 49e77245c21b624d2c2410fbd778360ac1a6672a..2667b9df21b2e43f1f8b69a04963fae0a922a20b 100644
--- a/script_support/components/M2/BOARD_TESTS/device-tree-overlay/pcie.dtso
+++ b/script_support/components/M2/BOARD_TESTS/device-tree-overlay/pcie.dtso
@@ -9,11 +9,11 @@
 	fabric-bus@40000000 {
 		m2_test_gpios: gpio@43000000 {
 			compatible = "microchip,core-gpio";
-			reg = <0x0 0x41100000 0x0 0x1000>;
+			reg = <0x0 0x43000000 0x0 0x1000>;
 			clocks = <&fabric_clk3>;
 			gpio-controller;
 			#gpio-cells = <2>;
-			ngpios=<16>;
+			ngpios=<7>;
 			status = "okay";
 			gpio-line-names = "M2_PERST0N", "M2_UART_WAKEN", "M2_W_DISABLE1", "M2_W_DISABLE2",
 			                  "M2_CLKREQ0N", "M2_PEWAKEN", "M2_I2C_ALTN";