diff --git a/README.md b/README.md
index 9f35f60..b60896c 100644
--- a/README.md
+++ b/README.md
@@ -102,10 +102,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-[addon-tvheadend]: https://github.com/dfigus/addon-tvheadend/tree/v4.1.4
-[addon-doc-tvheadend]: https://github.com/dfigus/addon-tvheadend/blob/v4.1.4/README.md
+[addon-tvheadend]: https://github.com/dfigus/addon-tvheadend/tree/v4.2.0
+[addon-doc-tvheadend]: https://github.com/dfigus/addon-tvheadend/blob/v4.2.0/README.md
 [tvheadend-issue]: https://github.com/dfigus/addon-tvheadend/issues
-[tvheadend-version-shield]: https://img.shields.io/badge/version-v4.1.4-blue.svg
+[tvheadend-version-shield]: https://img.shields.io/badge/version-v4.2.0-blue.svg
 [tvheadend-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [tvheadend-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [tvheadend-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
diff --git a/tvheadend/CHANGELOG.md b/tvheadend/CHANGELOG.md
index 79fb430..6b24565 100644
--- a/tvheadend/CHANGELOG.md
+++ b/tvheadend/CHANGELOG.md
@@ -1,11 +1,23 @@
 ## What’s changed
 
+## ✨ New features
+
+- Switch recordings folder to media @dfigus (#61)
+- Comskip ini config @dfigus (#65)
+
+## 🚀 Enhancements
+
+- Remove fallback to build latest TVHeadend commit @dfigus (#60)
+- NGINX security enhancements @dfigus (#64)
+
+## 🧰 Maintenance
+
+- Define regex versioning for picons releases @dfigus (#63)
+
 ## 📚 Documentation
 
-- Update Readme Template @dfigus (#57)
-- Update image links in DOCS to work from addon repos @dfigus (#58)
+- Remove stage experimental @dfigus (#59)
 
 ## ⬆️ Dependency updates
 
-- ⬆️ Update Add-on base image to v15.0.4 @renovate (#55)
-- ⬆️ Update tvheadend digest to c9b38a8 @renovate (#56)
+- ⬆️ Update picons/picons to v2024-01-11--21-19-56 @renovate (#62)
diff --git a/tvheadend/DOCS.md b/tvheadend/DOCS.md
index ab74bbe..a9696a1 100644
--- a/tvheadend/DOCS.md
+++ b/tvheadend/DOCS.md
@@ -77,6 +77,12 @@ As the addon-on will be regularily updated to the latest TVHeadend master versio
 a configuration migration quite often. To avoid the configuration backup (which can easily take 20-30 mins),
 you can use `--nobackup`.
 
+### Option: `comskip_ini`
+
+Content that should be used for the `comskip.ini`, which will be stored at `/config/tvheadend/comskip/comskip.ini`.
+The `comskip.ini` is required to tell Comskip how to detect commercials in the recording. See also the [Comskip section](#Comskip).
+It is recommended to edit it in YAML and use the [YAML literal style][yaml-literal] to preserve newline.
+
 ## Additional Configuration
 
 ### Picons
@@ -105,13 +111,9 @@ comes with a self-compiled version from the current master branch. The Comskip e
 
 Comskip needs a configuration (ini) file in order to properly
 detect the commercial. Those ini files are usually country dependent and can be obtained in the [Comskip Forum][comskip-forum].
-Afterwards you need to place them inside a folder, that is accessible for the add-on. E.g. I would recommend to use the local
-addon config folder `/addon-configs/<>_tvheadend/tvheadend/` on supervisor side and `/config/tvheadend/` on addon-side.
-I might add a configuration option in the future.
-
-Finally configure comskip as a recording post-processor command in Configuration->Recording->Digital Video Recorder Profiles, e.g.:
+You can use the [comskip_ini config option](#option-comskip_ini) to let the addon store the `comskip.ini`.
+Afterwards configure Comskip as a recording post-processor command in Configuration->Recording->Digital Video Recorder Profiles, e.g.:
 `/usr/bin/comskip --ini=/config/tvheadend/comskip/comskip.ini "%f`
-In this case the ini file is stored at `/config/tvheadend/comskip/comskip.ini`
 
 ![picons-reset-icons](https://github.com/dfigus/addon-tvheadend/raw/main/images/comskip-config.png)
 
@@ -176,6 +178,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 [tvh-args]: https://github.com/tvheadend/tvheadend/blob/master/docs/markdown/cmdline_options.md
+[yaml-literal]: https://yaml.org/spec/1.2.2/#812-literal-style
 [picons]: https://github.com/picons/picons
 [comskip]: https://github.com/erikkaashoek/Comskip
 [comskip-forum]: https://www.kaashoek.com/comskip/
diff --git a/tvheadend/README.md b/tvheadend/README.md
index 01bad49..c737882 100644
--- a/tvheadend/README.md
+++ b/tvheadend/README.md
@@ -31,5 +31,5 @@ This add-on has the following additional software preinstalled:
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-v4.1.4-blue.svg
-[release]: https://github.com/dfigus/addon-tvheadend/tree/v4.1.4
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-v4.2.0-blue.svg
+[release]: https://github.com/dfigus/addon-tvheadend/tree/v4.2.0
\ No newline at end of file
diff --git a/tvheadend/config.yaml b/tvheadend/config.yaml
index 5de133d..d3f81bb 100644
--- a/tvheadend/config.yaml
+++ b/tvheadend/config.yaml
@@ -1,12 +1,10 @@
 name: TVHeadend
-version: 4.1.4
-stage: experimental
+version: 4.2.0
 slug: tvheadend
 description: TV streaming server and recorder.
 url: https://github.com/dfigus/addon-tvheadend
 ingress: true
 ingress_stream: true
-ingress_port: 80
 init: false
 panel_icon: mdi:television
 arch:
@@ -28,14 +26,17 @@ ports_description:
 map:
 - addon_config:rw
 - share:rw
+- media:rw
 options:
   system_packages: []
   init_commands: []
   args: ''
+  comskip_ini: ''
 schema:
   system_packages:
-  - str
+  - str?
   init_commands:
-  - str
-  args: str
+  - str?
+  args: str?
+  comskip_ini: str?
 image: ghcr.io/dfigus/tvheadend/{arch}
diff --git a/tvheadend/translations/en.yaml b/tvheadend/translations/en.yaml
new file mode 100644
index 0000000..99cf5cf
--- /dev/null
+++ b/tvheadend/translations/en.yaml
@@ -0,0 +1,17 @@
+---
+configuration:
+  system_packages:
+    name: System Packages
+    description: >-
+      Allows you to specify additional Alpine packages to be installed. Note: Adding many packages will result in a longer start-up time for the add-on.
+  init_commands:
+    name: Init Commands
+    description: >-
+      Allows you to specify shell commands that shall run during the startup.
+  args:
+    name: TVHeadend Startup Arguments
+    description: Additional startup arguments to be passed to TVHeadend.
+  comskip_ini:
+    name: Comskip ini
+    description: >-
+      Content that shall be stored as comskip.ini.