diff --git a/docs/bill_of_materials.md b/docs/bill_of_materials.md
index bdd86620..90bc75ce 100644
--- a/docs/bill_of_materials.md
+++ b/docs/bill_of_materials.md
@@ -50,6 +50,12 @@ You need a WiFi solution for each JetBot. Select an option and get the parts sp
#### Option 1 (default) - M2 Card + Antennas
+This option is a good choice if you're building JetBot with the original Jetson Nano 4GB. It has been widely tested and used for JetBot.
+
+???+ attention
+
+ Jetson Nano 2GB does not have a M.2 connector, so this option will not work with it.
+
| **Part** | **Quantity** | **Cost** | **URL** | **Notes** |
| --- | --: | --: | --- | --- |
| WiFi card | 1 | $18.95 | [Amazon](https://amzn.to/2WKEkum), [NewEgg](https://www.neweggbusiness.com/Product/Product.aspx?Item=9SIV21M85N2699) | M2, Intel Wireless-AC 8265 |
@@ -57,12 +63,17 @@ You need a WiFi solution for each JetBot. Select an option and get the parts sp
#### Option 2 - USB Dongle
-???+ bug
- Notice (5/17/2019): We're currently tracking an issue with the Linux driver for the below USB WiFi dongle that may cause connectivity issues. You can find information in [this forum post](https://devtalk.nvidia.com/default/topic/1049303/jetson-nano/jetson-nano-wifi-/post/5329699/#5329699). For now, we recommend using Option 1 listed above. Thank you to those who discovered this issue!
+This option is compatible with both the original Jetson Nano (4GB) and Jetson Nano 2GB.
| **Part** | **Quantity** | **Cost** | **URL** | **Notes** |
| --- | --: | --: | --- | --- |
-| WiFi Dongle | 1 | $9.99 | [Amazon](https://amzn.com/B003MTTJOY/) | RTL8192U chipset |
+| WiFi Dongle - TP-Link Archer T2U Nano | 1 | $17.99 | [Amazon](https://amzn.com/B07PB1X4CN/) | RTL8811AU chipset |
+| WiFi Dongle - TP-Link Archer T2U Plus | 1 | $19.99 | [Amazon](https://amzn.com/B07P5PRK7J/) | RTL8811AU chipset |
+
+???+ info
+ For other possible USB Wi-fi dongles that you can use on Jetson Nano, please check the Suported Components List.
+
+ - [Jetson Nano 2GB Developer Kit User Guide - Supported Component List](https://developer.nvidia.com/embedded/learn/jetson-nano-2gb-devkit-user-guide#id-.JetsonNano2GBDeveloperKitUserGuidevbatuu_v1.0-SupportedComponentList)
### Wheels
diff --git a/docs/hardware_setup.md b/docs/hardware_setup.md
index 99c7043c..bd458b76 100644
--- a/docs/hardware_setup.md
+++ b/docs/hardware_setup.md
@@ -106,6 +106,10 @@ To build JetBot you'll need the following tools
### Step 6 - Mount WiFi antennas
+!!! attention ""
+
+ Skip this step if you are using a USB WiFi dongle instead of the M.2 WiFi module
+
@@ -119,6 +123,10 @@ To build JetBot you'll need the following tools
### Step 7 - Remove Jetson Nano module from developer kit
+!!! attention ""
+
+ Skip this step if you are using a USB WiFi dongle instead of the M.2 WiFi module
+
@@ -131,6 +139,10 @@ To build JetBot you'll need the following tools
### Step 8 - Attach WiFi module to developer kit
+!!! attention ""
+
+ Skip this step if you are using a USB WiFi dongle instead of the M.2 WiFi module
+
diff --git a/docs/software_setup/docker.md b/docs/software_setup/docker.md
index 8df22e75..857536eb 100644
--- a/docs/software_setup/docker.md
+++ b/docs/software_setup/docker.md
@@ -15,6 +15,7 @@ You can use your existing Jetson Nano set up (microSD card), as long as you have
For this, we'll assume you've set up your Jetson Nano using the **online Getting Started guide**.
- [Getting Started With Jetson Nano Developer Kit](https://developer.nvidia.com/embedded/learn/get-started-jetson-nano-devkit)
+ - [Getting Started with Jetson Nano 2GB Developer Kit](https://developer.nvidia.com/embedded/learn/get-started-jetson-nano-2gb-devkit)
## Step 2 - Connect to Wi-Fi