diff --git a/boards/beagleplay/connect-wifi.rst b/boards/beagleplay/connect-wifi.rst
new file mode 100644
index 0000000000000000000000000000000000000000..0e04f20402289375e2a64b58ac4cc4a6dd2de934
--- /dev/null
+++ b/boards/beagleplay/connect-wifi.rst
@@ -0,0 +1,88 @@
+.. _beagleplay-connect-wifi:
+
+Connect WiFi
+#############
+
+wpa_gui
+********
+
+Simplest way to connect to WiFi is to use ``wpa_gui`` tool pre-installed on your BeaglePlay. 
+Follow simple steps below to connect to any WiFi access point.
+
+Step1. Starting wpa_gui
+========================
+
+You can start ``wpa_gui`` either from ``Applications > Internet > wpa_gui`` or double click on the ``wpa_gui`` desktop application shortcut.
+
+.. figure:: images/wpa_gui_step1a.png
+    :align: center
+    :alt: Starting wpa_gui from Applications > Internet > wpa_gui
+
+    Starting wpa_gui from Applications > Internet > wpa_gui
+
+.. figure:: images/wpa_gui_step1b.png
+    :align: center
+    :alt: Starting wpa_gui from Desktop application shortcut
+
+    Starting wpa_gui from Desktop application shortcut    
+
+Step2. Understanding wpa_gui interface
+=======================================
+
+The ``wpa_gui`` interface is very simple to understand and use.
+
+1. ``Adapter`` is the WiFi interface device, it should be ``wlan0`` (on-board WiFi) by default.
+2. ``Network`` shows the WiFi access point ``SSID`` if you are connected to that network.
+3. ``Current Status`` tab shows you network information if you are connected to any network.
+    - Click on ``Connect`` to connect if not automatically done.
+    - Click on ``Disconnect`` to disconnect/reset the connection.
+    - Click on ``Scan`` to scan nearby WiFi access points.
+4. ``Manage Network`` tab shows you all the saved networks and options to manage those.
+
+.. figure:: images/wpa_gui_step2.png
+    :align: center
+    :alt: wpa_gui interface
+
+    wpa_gui interface
+
+Step3. Scanning & Connecting to WiFi access points
+===================================================
+
+To scan the WiFi access points around you, just click on ``Scan`` button availale under 
+``wpa_gui > Current Status > Scan``.
+
+.. figure:: images/wpa_gui_step3a.png
+    :align: center
+    :alt: Scanning WiFi access points
+
+    Scanning WiFi access points
+
+A new window will open up with,
+
+1. SSID (WiFi name)
+2. BSSID
+3. Frequency
+4. Signal strenght
+5. flags
+
+Now, you just have to double click on the Network you want to connect to as shown below.
+
+.. note:: 
+    SSIDs and BSSIDs are not fully visible in screenshot below 
+    but you can change the column length to see the WiFi names better.
+
+.. figure:: images/wpa_gui_step3b.png
+    :align: center
+    :alt: Selecting WiFi access point
+
+    Selecting WiFi access point
+
+Final step is to type your WiFi access point password under ``PSK`` input field and 
+click on ``Add`` (as shown in screenshot below) which will automatically connect 
+your board to WiFi (if password is correct). 
+
+.. figure:: images/wpa_gui_step3c.png
+    :align: center
+    :alt: Connecting to WiFi access point
+
+    Connecting to WiFi access point
diff --git a/boards/beagleplay/images/wpa_gui_step1a.png b/boards/beagleplay/images/wpa_gui_step1a.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ea7ec7b845fb2f1b17b882004b5f4739e0ce60d
Binary files /dev/null and b/boards/beagleplay/images/wpa_gui_step1a.png differ
diff --git a/boards/beagleplay/images/wpa_gui_step1b.png b/boards/beagleplay/images/wpa_gui_step1b.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4614cb9622385b0dfa6193feada246fcfd36c6f
Binary files /dev/null and b/boards/beagleplay/images/wpa_gui_step1b.png differ
diff --git a/boards/beagleplay/images/wpa_gui_step2.png b/boards/beagleplay/images/wpa_gui_step2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a594d12b6efe55529761fc5e302771d5529642d
Binary files /dev/null and b/boards/beagleplay/images/wpa_gui_step2.png differ
diff --git a/boards/beagleplay/images/wpa_gui_step3a.png b/boards/beagleplay/images/wpa_gui_step3a.png
new file mode 100644
index 0000000000000000000000000000000000000000..60ecb250586ec0face481cd997f9582665a8b4e5
Binary files /dev/null and b/boards/beagleplay/images/wpa_gui_step3a.png differ
diff --git a/boards/beagleplay/images/wpa_gui_step3b.png b/boards/beagleplay/images/wpa_gui_step3b.png
new file mode 100644
index 0000000000000000000000000000000000000000..eea964f302e709ba294eea0c3f93a38d9ed3eb70
Binary files /dev/null and b/boards/beagleplay/images/wpa_gui_step3b.png differ
diff --git a/boards/beagleplay/images/wpa_gui_step3c.png b/boards/beagleplay/images/wpa_gui_step3c.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb28c77bef9095b5815916ef90e89c2cfc9ba3f6
Binary files /dev/null and b/boards/beagleplay/images/wpa_gui_step3c.png differ
diff --git a/boards/beagleplay/index.rst b/boards/beagleplay/index.rst
index 09effcca721ec9ea8b5b1d8e15c3f38b130078d8..3e1b6d67dd14437dbfcb25b890baca7f6e176afc 100644
--- a/boards/beagleplay/index.rst
+++ b/boards/beagleplay/index.rst
@@ -3,6 +3,10 @@
 BeaglePlay
 ##########
 
+.. important::
+    This is a work in progress, for latest documentation please 
+    visit https://docs.beagleboard.org/latest/
+
 BeaglePlay is an open-source single board computer designed to simplify the process of adding
 sensors, actuators, indicators, human interfaces, and connectivity to a reliable embedded system.
 It features a powerful 64-bit, quad-core processor and innovative connectivity options, including
@@ -34,6 +38,7 @@ provides a positive development experience for users.
 .. toctree::
    :maxdepth: 1
 
+   /boards/beagleplay/connect-wifi.rst
    /boards/beagleplay/using-serial-console.rst
    /boards/beagleplay/using-mikrobus.rst
    /boards/beagleplay/using-qwiic.rst