diff --git a/source/_includes/common-tasks/data_disk.md b/source/_includes/common-tasks/data_disk.md
index 0238917b08e..33cd7dddd03 100644
--- a/source/_includes/common-tasks/data_disk.md
+++ b/source/_includes/common-tasks/data_disk.md
@@ -28,9 +28,9 @@ The data disk feature can be used on an existing installation without losing dat
1. Connect the data disk to your system.
2. Go to **{% my storage title="Settings > System > Storage" %}** in the UI.
-3. Press the three dots on the top right and choose "Move datadisk"
+3. Select the "Move data disk" button.
4. Select the data disk from the list of available devices.
-5. Press "Move".
+5. Select **Move**.
diff --git a/source/_includes/common-tasks/network_storage.md b/source/_includes/common-tasks/network_storage.md
new file mode 100644
index 00000000000..728e9622f48
--- /dev/null
+++ b/source/_includes/common-tasks/network_storage.md
@@ -0,0 +1,81 @@
+## Network storage
+
+You can configure both Network File Share (NFS) and Windows samba (CIFS) targets to be used within Home Assistant and add-ons.
+To list all your currently connected network storages, go to **{% my storage title="Settings > System > Storage" %}** in the UI.
+
+{% if page.installation == "os" %}
+
+
+ You need to update to Home Assistant Operating System 10.2 before you can use this feature.
+
+
+{% endif %}
+
+
+
+
+
+
+ Screenshot of the list of network shares inside the storage panel.
+
+
+### Add a new new network storage
+
+1. Go to **{% my storage title="Settings > System > Storage" %}** in the UI.
+1. Select **Add network storage**.
+1. Fill out all the information for your network storage.
+1. Select **Connect**.
+
+
+
+
+
+
+ Screenshot of connecting a new network storage.
+
+
+#### Network storage configuration
+
+{% configuration_basic "hassio.network_share" %}
+Name:
+ description: This is the name that will be used for the mounted directory on your system.
+Usage:
+ description: Here, you select how the target should be used.
+Server:
+ description: The IP/hostname of the server running NFS/CIFS.
+Protocol:
+ description: The service the server is using for the network storage.
+"[NFS]1 Remote share path":
+ description: The path used to connect to the remote storage server.
+"[CIFS]2 Username":
+ description: The username to use when connecting to the storage server.
+"[CIFS]2 Password":
+ description: The password to use when connecting to the storage server.
+"[CIFS]2 Share":
+ description: The share to connect to on the storage server.
+{% endconfiguration_basic %}
+
+1 _Options prefixed with `[NFS]` is only available for NFS targets._
+2 _Options prefixed with `[CIFS]` is only available for CIFS targets._
+
+### Change default backup location
+
+By default, the first network storage of type **Backup** that you add will be set as your default backup target.
+
+If you want to change the default backup target, you can do the following:
+
+1. Go to **{% my backup title="Settings > System > Backups" %}** in the UI.
+1. Select the menu in the top right of the screen and select the **Change default backup location** option.
+1. In the dialog, there is a single option to set the default backup target.
+1. Choose the one you want from the list.
+1. Select **Save**.
+
+This list will contain all the network storage targets you have added of usage type **Backup**. It also contains another option to set it back to use `/backup` again.
+
+
+
+
+
+
+ Screenshot of changing the default backup target.
+
diff --git a/source/_integrations/media_source.markdown b/source/_integrations/media_source.markdown
index d4745da15a6..b12f6ef72b2 100644
--- a/source/_integrations/media_source.markdown
+++ b/source/_integrations/media_source.markdown
@@ -62,9 +62,13 @@ homeassistant:
recording: /mnt/recordings
```
-Please note, that the folder must be accessible locally. Home Assistant
-cannot connect to external or remote network shares using this configuration
-option.
+
+
+ If you want to use media from a network storage, the network storage must first be connected first. Refer to [these instructions on how to connect network storage](/common-tasks/os/#network-storage).
+
+ The media from the network storage is then automatically added to the local media browser.
+
+
## Playing media from a Media Source
diff --git a/source/common-tasks/os.markdown b/source/common-tasks/os.markdown
index 6f4e629c12f..550a6b6345c 100644
--- a/source/common-tasks/os.markdown
+++ b/source/common-tasks/os.markdown
@@ -13,6 +13,7 @@ This section will provide guides to some common tasks and information which you
{% include common-tasks/configuration_check.md %}
{% include common-tasks/file_access.md %}
{% include common-tasks/backups.md %}
+{% include common-tasks/network_storage.md %}
{% include common-tasks/commandline.md %}
{% include common-tasks/lost_password.md %}
{% include common-tasks/third-party-addons.md %}
diff --git a/source/common-tasks/supervised.markdown b/source/common-tasks/supervised.markdown
index f7305e00783..f5f816d19eb 100644
--- a/source/common-tasks/supervised.markdown
+++ b/source/common-tasks/supervised.markdown
@@ -11,6 +11,7 @@ installation_name: Supervised
{% include common-tasks/configuration_check.md %}
{% include common-tasks/file_access.md %}
{% include common-tasks/backups.md %}
+{% include common-tasks/network_storage.md %}
{% include common-tasks/commandline.md %}
{% include common-tasks/lost_password.md %}
{% include common-tasks/third-party-addons.md %}
\ No newline at end of file
diff --git a/source/images/screenshots/network-storage/change_backup_dark.png b/source/images/screenshots/network-storage/change_backup_dark.png
new file mode 100644
index 00000000000..6231188c0f4
Binary files /dev/null and b/source/images/screenshots/network-storage/change_backup_dark.png differ
diff --git a/source/images/screenshots/network-storage/change_backup_light.png b/source/images/screenshots/network-storage/change_backup_light.png
new file mode 100644
index 00000000000..bfe646bbb74
Binary files /dev/null and b/source/images/screenshots/network-storage/change_backup_light.png differ
diff --git a/source/images/screenshots/network-storage/connect_dark.png b/source/images/screenshots/network-storage/connect_dark.png
new file mode 100644
index 00000000000..03dcbdd1e1d
Binary files /dev/null and b/source/images/screenshots/network-storage/connect_dark.png differ
diff --git a/source/images/screenshots/network-storage/connect_light.png b/source/images/screenshots/network-storage/connect_light.png
new file mode 100644
index 00000000000..5b42fb7f6bc
Binary files /dev/null and b/source/images/screenshots/network-storage/connect_light.png differ
diff --git a/source/images/screenshots/network-storage/list_dark.png b/source/images/screenshots/network-storage/list_dark.png
new file mode 100644
index 00000000000..2128484865e
Binary files /dev/null and b/source/images/screenshots/network-storage/list_dark.png differ
diff --git a/source/images/screenshots/network-storage/list_light.png b/source/images/screenshots/network-storage/list_light.png
new file mode 100644
index 00000000000..6614983a29b
Binary files /dev/null and b/source/images/screenshots/network-storage/list_light.png differ
+ 
+ 
+