diff --git a/docs/User-Guide_Armbian-Config/Network.md b/docs/User-Guide_Armbian-Config/Network.md
index ef544c79..ecfb0ec0 100644
--- a/docs/User-Guide_Armbian-Config/Network.md
+++ b/docs/User-Guide_Armbian-Config/Network.md
@@ -108,5 +108,105 @@ armbian-config --cmd NE005
+***
+
+## WireGuard VPN client / server
+
+
+[](#)
+
+
+
+
+WireGuard is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography. It aims to be faster, simpler, leaner, and more useful than IPsec, while avoiding the massive headache. It intends to be considerably more performant than OpenVPN. WireGuard is designed as a general purpose VPN for running on embedded interfaces and super computers alike, fit for many different circumstances. Initially released for the Linux kernel, it is now cross-platform (Windows, macOS, BSD, iOS, Android) and widely deployable. Regarded as the most secure, easiest to use, and simplest VPN solution in the industry.
+
+
+**Command:**
+~~~
+armbian-config --cmd WG001
+~~~
+
+**Author:** @armbian
+
+**Status:** Enabled
+
+
+
+=== "Access to the server from internet"
+
+ Remember to open/forward the port 51820 (UDP) through NAT on your router.
+
+=== "Directories"
+
+ - Install directory: `/armbian/wireguard`
+ - Site configuration directory: `/armbian/wireguard/config`
+
+=== "View logs"
+
+ ```sh
+ docker logs -f wireguard
+ ```
+
+# Install server and enable private network on a client
+
+1. Install Wireguard server
+2. It will asks you for peer keywords. It will make a profile for each peer
+3. Download client to your PC, server or mobile phone. Scan OR code or copy credentials to the client.
+
+Enjoy private network! Its that easy.
+
+More informations:
+
+
+
+
+
+
+***
+
+## WireGuard remove
+This operation will remove WireGuard
+
+**Command:**
+~~~
+armbian-config --cmd WG002
+~~~
+
+**Author:** @armbian
+
+**Status:** Enabled
+
+
+
+***
+
+## WireGuard clients QR codes
+**Command:**
+~~~
+armbian-config --cmd WG003
+~~~
+
+**Author:** @armbian
+
+**Status:** Enabled
+
+
+
+***
+
+## WireGuard purge with data folder
+This operation will purge WireGuard with data folder
+
+**Command:**
+~~~
+armbian-config --cmd WG004
+~~~
+
+**Author:** @armbian
+
+**Status:** Enabled
+
+
+
***
diff --git a/docs/User-Guide_Armbian-Software/Printing.md b/docs/User-Guide_Armbian-Software/Printing.md
new file mode 100644
index 00000000..50aa1414
--- /dev/null
+++ b/docs/User-Guide_Armbian-Software/Printing.md
@@ -0,0 +1,83 @@
+# Tools for printing and 3D printing
+
+
+***
+
+## OctoPrint web-based 3D printers management tool
+
+
+[](#)
+
+
+
+
+OctoPrint is an open source 3D printer controller application, which provides a web interface for the connected printers. It displays printers status and key parameters and allows user to schedule prints and remotely control the printer.
+
+
+This operation will install OctoPrint
+
+**Command:**
+~~~
+armbian-config --cmd OCT001
+~~~
+
+**Author:** @armbian
+
+**Status:** Stable
+
+
+
+=== "Access to the web interface"
+
+ The web interface is accessible via port **7981**:
+
+ - URL: `https://:7981`
+
+=== "Directories"
+
+ - Install directory: `/armbian/octoprint`
+
+=== "View logs"
+
+ ```sh
+ docker logs -f octoprint
+ ```
+
+
+
+
+
+***
+
+## OctoPrint remove
+This operation will remove OctoPrint
+
+**Command:**
+~~~
+armbian-config --cmd OCT002
+~~~
+
+**Author:** @armbian
+
+**Status:** Stable
+
+
+
+***
+
+## OctoPrint purge with data folder
+This operation will purge OctoPrint with data folder
+
+**Command:**
+~~~
+armbian-config --cmd OCT003
+~~~
+
+**Author:** @armbian
+
+**Status:** Stable
+
+
+
+***
+
diff --git a/docs/images/WG001.png b/docs/images/WG001.png
new file mode 100644
index 00000000..9ff2d50e
Binary files /dev/null and b/docs/images/WG001.png differ