diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84f5834..cd79f8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,21 @@ The used format is based on
 [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.42] - 2026-05-06
+
+### 🐛 Bug Fixes
+
+- _(notifiers)_ Enforce template usage and fix dynamic template directory
+  discovery
+
+### 💼 Other
+
+- Ensure all template files are installed automatically
+
+### ⚙️ Miscellaneous Tasks
+
+- _(release)_ Bump version to 1.5.41
+
 ## [1.5.41] - 2026-05-06
 
 ### 🐛 Bug Fixes
diff --git a/Makefile b/Makefile
index fefd39c..a81b866 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 NAME := flatpak-automatic
 EPOCH := 1
-VERSION := 1.5.41
+VERSION := 1.5.42
 REL_NUM := 1
 DATE := $(shell LC_ALL=C date +"%a %b %d %Y")
 AUTHOR := "fedoraBee <9395414+fedoraBee@users.noreply.github.com>"
@@ -55,12 +55,7 @@ install:
 	install -m 0644 config/config.example.yaml $(DESTDIR)/etc/flatpak-automatic/config.example.yaml
 	install -m 0644 config/config.user.default.yaml $(DESTDIR)/etc/flatpak-automatic/config.user.yaml
 	install -m 0644 config/config.default.yaml $(DESTDIR)/etc/flatpak-automatic/config.yaml
-	install -m 0644 config/templates/default.md $(DESTDIR)/etc/flatpak-automatic/templates/default.md
-	install -m 0644 config/templates/default_success.md $(DESTDIR)/etc/flatpak-automatic/templates/default_success.md
-	install -m 0644 config/templates/default_failure.md $(DESTDIR)/etc/flatpak-automatic/templates/default_failure.md
-	install -m 0644 config/templates/default_mail_success.md $(DESTDIR)/etc/flatpak-automatic/templates/default_mail_success.md
-	install -m 0644 config/templates/default_mail_failure.md $(DESTDIR)/etc/flatpak-automatic/templates/default_mail_failure.md
-	install -m 0644 config/templates/minimal.txt $(DESTDIR)/etc/flatpak-automatic/templates/minimal.txt
+	install -m 0644 config/templates/* $(DESTDIR)/etc/flatpak-automatic/templates/
 
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
diff --git a/assets/banner.svg b/assets/banner.svg
index 5407768..0b02b44 100644
--- a/assets/banner.svg
+++ b/assets/banner.svg
@@ -17,6 +17,6 @@
     <tspan x="50%" dy="1.2em" text-anchor="middle" class="c3"> | _|| / _` || ._| '_ \/ _` || / / </tspan>
     <tspan x="50%" dy="1.2em" text-anchor="middle" class="c4"> |_| |_\__,_|\__|| .__/\__,_||_\_\ </tspan>
     <tspan x="225" dy="1.2em" text-anchor="middle" class="c4">    AUTOMATIC    |_|               </tspan>
-    <tspan x="280" class="c1 c-text"> v1.5.41</tspan>
+    <tspan x="280" class="c1 c-text"> v1.5.42</tspan>
   </text>
 </svg>
diff --git a/config/sysconfig/flatpak-automatic b/config/sysconfig/flatpak-automatic
index d09ca2d..00d6729 100644
--- a/config/sysconfig/flatpak-automatic
+++ b/config/sysconfig/flatpak-automatic
@@ -6,7 +6,7 @@
 # Please migrate your settings to the new YAML format.
 # ==============================================================================
 
-# Version: 1.5.41 | Built for Fedora & Universal RPM Systems
+# Version: 1.5.42 | Built for Fedora & Universal RPM Systems
 # Built for Fedora & Universal RPM Systems
 
 # --- [ Universal Notifications (Apprise) ] ---
diff --git a/pyproject.toml b/pyproject.toml
index 5a4e4e7..12fdfe1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flatpak-automatic"
-version = "1.5.41"
+version = "1.5.42"
 authors = [
   { name = "fedoraBee", email = "9395414+fedoraBee@users.noreply.github.com" },
 ]
diff --git a/src/flatpak-automatic.py b/src/flatpak-automatic.py
index 0241510..dfc6765 100755
--- a/src/flatpak-automatic.py
+++ b/src/flatpak-automatic.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Version: 1.5.41
+# Version: 1.5.42
 import sys
 import os
 
diff --git a/src/flatpak_automatic/__init__.py b/src/flatpak_automatic/__init__.py
index df7bc77..44e10f5 100644
--- a/src/flatpak_automatic/__init__.py
+++ b/src/flatpak_automatic/__init__.py
@@ -1,6 +1,6 @@
 from .updater import FlatpakUpdater
 
-__version__ = "1.5.41"
+__version__ = "1.5.42"
 
 from .snapper import SnapperManager
 from .config import ConfigManager, StateManager
diff --git a/src/flatpak_automatic/cli.py b/src/flatpak_automatic/cli.py
index 2d6c9cc..fd0553e 100644
--- a/src/flatpak_automatic/cli.py
+++ b/src/flatpak_automatic/cli.py
@@ -10,7 +10,7 @@ def banner() -> str:
         f"{Colors.OKBLUE} | __| |__ _ | |_ _ __  __ _ | |__ \n"
         f"{Colors.HEADER} | _|| / _` || ._| '_ \\/ _` || / / \n"
         f"{Colors.OKPINK} |_| |_\\__,_|\\__|| .__/\\__,_||_\\_\\\n"
-        f"    AUTOMATIC    |_| {Colors.ENDC}     {Colors.OKCYAN} v1.5.41{Colors.ENDC}\n"
+        f"    AUTOMATIC    |_| {Colors.ENDC}     {Colors.OKCYAN} v1.5.42{Colors.ENDC}\n"
     )
 
 
diff --git a/tbump.toml b/tbump.toml
index 3ac6594..d43d122 100644
--- a/tbump.toml
+++ b/tbump.toml
@@ -1,5 +1,5 @@
 [version]
-current = "1.5.41"
+current = "1.5.42"
 # Updated regex to support X.Y.Z and X.Y.Z-rc1 (or -beta, -alpha)
 regex = '''
   (?P<major>\d+)