diff --git a/docs/User-Guide_Armbian-Software/HomeAutomation.md b/docs/User-Guide_Armbian-Software/HomeAutomation.md
index 293e9f44..71bb31fd 100644
--- a/docs/User-Guide_Armbian-Software/HomeAutomation.md
+++ b/docs/User-Guide_Armbian-Software/HomeAutomation.md
@@ -217,5 +217,86 @@ armbian-config --cmd DOM003
 
 
 
+***
+
+## EVCC - solar charging automation
+
+<!--- section image START from tools/include/images/EVCC01.png --->
+[![EVCC - solar charging automation](/images/EVCC01.png)](#)
+<!--- section image STOP from tools/include/images/EVCC01.png --->
+
+
+<!--- header START from tools/include/markdown/EVCC01-header.md --->
+evcc is an energy management system with a focus on electromobility. The software controls your EV charger or smart plug. It communicates with your vehicle, inverter or home storage to make intelligent charging decisions. The software is open source and community-driven.
+
+<!--- header STOP from tools/include/markdown/EVCC01-header.md --->
+
+This operation will install solar charging automation.
+
+**Command:** 
+~~~
+armbian-config --cmd EVCC01
+~~~
+
+**Author:** @igorpecovnik
+
+**Status:** Preview
+
+
+<!--- footer START from tools/include/markdown/EVCC01-footer.md --->
+=== "Access to the web interface"
+
+    The web interface is accessible via port **7070**:
+
+    - URL: `https://<your.IP>:7070`
+    - Admin password is generated at first web interface login
+
+=== "Directories"
+
+    - Install directory: `/armbian/evcc`
+    - Site configuration directory: `/armbian/evcc/evcc.yaml`
+
+=== "View logs"
+
+    ```sh
+    docker logs -f evcc
+    ```
+
+<!--- footer STOP from tools/include/markdown/EVCC01-footer.md --->
+
+
+
+***
+
+## EVCC - solar charging automation remove
+This operation will remove solar charging automation.
+
+**Command:** 
+~~~
+armbian-config --cmd EVCC02
+~~~
+
+**Author:** @igorpecovnik
+
+**Status:** Preview
+
+
+
+***
+
+## EVCC purge with data folder
+This operation will purge solar charging automation with data folder.
+
+**Command:** 
+~~~
+armbian-config --cmd EVCC03
+~~~
+
+**Author:** @igorpecovnik
+
+**Status:** Preview
+
+
+
 ***
 
diff --git a/docs/User-Guide_Armbian-Software/Media.md b/docs/User-Guide_Armbian-Software/Media.md
index 245fc6f6..74abba76 100644
--- a/docs/User-Guide_Armbian-Software/Media.md
+++ b/docs/User-Guide_Armbian-Software/Media.md
@@ -384,5 +384,82 @@ armbian-config --cmd MED027
 
 
 
+***
+
+## Jellyfin Media System
+
+<!--- section image START from tools/include/images/MED030.png --->
+[![Jellyfin Media System](/images/MED030.png)](#)
+<!--- section image STOP from tools/include/images/MED030.png --->
+
+
+<!--- header START from tools/include/markdown/MED030-header.md --->
+Jellyfin is a Free Software Media System that puts you in control of managing and streaming your media. It is an alternative to the proprietary Emby and Plex, to provide media from a dedicated server to end-user devices via multiple apps. Jellyfin is descended from Emby's 3.5.2 release and ported to the .NET Core framework to enable full cross-platform support. There are no strings attached, no premium licenses or features, and no hidden agendas: just a team who want to build something better and work together to achieve it.
+
+<!--- header STOP from tools/include/markdown/MED030-header.md --->
+
+**Command:** 
+~~~
+armbian-config --cmd MED030
+~~~
+
+**Author:** @igorpecovnik
+
+**Status:** Preview
+
+
+<!--- footer START from tools/include/markdown/MED030-footer.md --->
+=== "Access to the web interface"
+
+    The web interface is accessible via port **8096**:
+
+    - URL: `http://<your.IP>:8096`
+    - Username and password are set at first login
+
+=== "Directories"
+
+    - Install directory: `/armbian/jellyfin`
+    - Site configuration directory: `/armbian/jellyfin/config`
+    - TV shows directory: `/armbian/jellyfin/tvseries`
+    - Movies directory: `/armbian/jellyfin/movies`
+
+=== "View logs"
+
+    ```sh
+    docker logs -f jellyfin
+    ```
+
+<!--- footer STOP from tools/include/markdown/MED030-footer.md --->
+
+
+
+***
+
+## Jellyfin remove
+**Command:** 
+~~~
+armbian-config --cmd MED031
+~~~
+
+**Author:** @igorpecovnik
+
+**Status:** Preview
+
+
+
+***
+
+## Jellyfin purge with data folder
+**Command:** 
+~~~
+armbian-config --cmd MED032
+~~~
+
+**Author:** @igorpecovnik
+
+**Status:** Preview
+
+
+
 ***
 
diff --git a/docs/images/EVCC01.png b/docs/images/EVCC01.png
new file mode 100644
index 00000000..325eaa71
Binary files /dev/null and b/docs/images/EVCC01.png differ
diff --git a/docs/images/MED030.png b/docs/images/MED030.png
new file mode 100644
index 00000000..c2bbca2e
Binary files /dev/null and b/docs/images/MED030.png differ