diff --git a/variants/beagleconnect_freedom/beagleconnect_freedom.overlay b/variants/beagleconnect_freedom/beagleconnect_freedom.overlay
index 72fba1e3..b66d8c0b 100644
--- a/variants/beagleconnect_freedom/beagleconnect_freedom.overlay
+++ b/variants/beagleconnect_freedom/beagleconnect_freedom.overlay
@@ -6,7 +6,44 @@
 
  / {
 	zephyr,user {
-		digital-pin-gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>;	/* 2.4GHz TX/RX */
+		digital-pin-gpios = 
+				    <&gpio0 16 GPIO_ACTIVE_HIGH>, /* D0  - MB1 INT */
+				    <&gpio0 20 GPIO_ACTIVE_HIGH>, /* D1  - MB2 INT */
+				    <&gpio0 17 GPIO_ACTIVE_HIGH>, /* D2  - MB1 PWM */
+				    <&gpio0 28 GPIO_ACTIVE_HIGH>, /* D3  - MB1 CS - A5 */
+				    <&gpio0 21 GPIO_ACTIVE_HIGH>, /* D4  - MB2 UART1 RX */
+				    <&gpio0 22 GPIO_ACTIVE_HIGH>, /* D5  - MB2 UART1 TX */
+				    <&gpio0 19 GPIO_ACTIVE_HIGH>, /* D6  - MB2 PWM */
+				    <&gpio0 27 GPIO_ACTIVE_HIGH>, /* D7  - MB2 CS - A4 */
+				    <&gpio0 9  GPIO_ACTIVE_HIGH>, /* D8  - MB1/2 PICO */
+				    <&gpio0 10 GPIO_ACTIVE_HIGH>, /* D9  - MB1/2 SCK */
+				    <&gpio0 11 GPIO_ACTIVE_HIGH>, /* D10 - MB1/2 POCI */
+				    <&gpio0 26 GPIO_ACTIVE_HIGH>, /* D11 - MB1/2 SDA - A2 */
+				    <&gpio0 25 GPIO_ACTIVE_HIGH>, /* D12 - MB1/2 SCL - A3 */
+				    <&gpio0 12 GPIO_ACTIVE_HIGH>, /* D13 - MB1 UART0 RX */
+				    <&gpio0 13 GPIO_ACTIVE_HIGH>, /* D14 - MB1 UART0 TX */
+				    <&gpio0 23 GPIO_ACTIVE_HIGH>, /* D15 - MB1 AN - A0 */
+				    <&gpio0 24 GPIO_ACTIVE_HIGH>, /* D16 - MB2 AN - A1 */
+				    <&gpio0 5  GPIO_ACTIVE_HIGH>, /* D17 - MB2 RST */
+				    <&gpio0 6  GPIO_ACTIVE_HIGH>, /* D18 - MB1 RST */
+				    <&gpio0 7  GPIO_ACTIVE_HIGH>, /* D19 - on-board sensor INT */
+				    <&gpio0 8  GPIO_ACTIVE_HIGH>, /* D20 - flash CS */
+				    <&gpio0 14 GPIO_ACTIVE_HIGH>, /* D21 - on-board sensor I2C enable */
+				    <&gpio0 15 GPIO_ACTIVE_HIGH>, /* D22 - BOOT button */
+				    <&gpio0 18 GPIO_ACTIVE_HIGH>; /* D23 - LINK LED */
+
+		pwm-pin-gpios =
+				    <&gpio0 17 GPIO_ACTIVE_HIGH>, /* D2  - MB1 PWM */
+				    <&gpio0 3  GPIO_ACTIVE_HIGH>; /* D6  - MB2 PWM */
+
+		adc-pin-gpios =
+				    <&gpio0 23 GPIO_ACTIVE_HIGH>, /* D15 - MB1 AN - A0 */
+				    <&gpio0 24 GPIO_ACTIVE_HIGH>, /* D16 - MB2 AN - A1 */
+				    <&gpio0 26 GPIO_ACTIVE_HIGH>, /* D11 - MB1/2 SDA - A2 */
+				    <&gpio0 25 GPIO_ACTIVE_HIGH>, /* D12 - MB1/2 SCL - A3 */
+				    <&gpio0 27 GPIO_ACTIVE_HIGH>, /* D7  - MB2 CS - A4 */
+				    <&gpio0 28 GPIO_ACTIVE_HIGH>; /* D3  - MB1 CS - A5 */
+
 		builtin-led-gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>;	/*  2.4GHz TX/RX  */
 		serials = <&uart0 &uart1>;
 		i2cs = <&i2c0>;
diff --git a/variants/beagleconnect_freedom/variants.h b/variants/beagleconnect_freedom/variants.h
index 7b941ff5..efd90537 100644
--- a/variants/beagleconnect_freedom/variants.h
+++ b/variants/beagleconnect_freedom/variants.h
@@ -4,6 +4,3 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #pragma once
-
-#define LED_BUILTIN 0
-