diff --git a/.gitignore b/.gitignore
index e230a81..0c48c45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -257,3 +257,4 @@
 /lorax-40.5.15.tar.gz
 /lorax-40.5.16.tar.gz
 /lorax-40.5.17.tar.gz
+/lorax-40.5.18.tar.gz
diff --git a/lorax.spec b/lorax.spec
index 737d584..cba574c 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -3,7 +3,7 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        40.5.17
+Version:        40.5.18
 Release:        1%{?dist}.alma.1
 Summary:        Tool for creating the anaconda install images
 
@@ -186,10 +186,15 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 %{_datadir}/lorax/templates.d/*
 
 %changelog
-* Fri Aug 14 2026 Eduard Abdullin <eabdullin@almalinux.org> - 40.5.17-1.alma.1
+* Wed Aug 19 2026 Eduard Abdullin <eabdullin@almalinux.org> - 40.5.18-1.alma.1
 - Add x86_64_v2 support
 - Add riscv64 support
 
+* Mon Aug 17 2026 Brian C. Lane <bcl@redhat.com> 40.5.18-1
+- templates: Synchronize generic templates with lorax-templates-rhel (bcl)
+  Resolves: RHEL-224460
+  Related: RHEL-224409
+
 * Wed Aug 12 2026 Brian C. Lane <bcl@redhat.com> 40.5.17-1
 - creator: Use safe_joinpaths in mount_boot_part_over_root (bcl)
   Resolves: RHEL-238020
diff --git a/sources b/sources
index 1a044be..579315c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lorax-40.5.17.tar.gz) = 3e942e739f518a8ea367b03152d2c20b701b9a92cf5cdc4cb341418c56906240b4c39b3e096e6218b93ba493e9ba7fa5b4dd1b21af31b67847d867a35f118061
+SHA512 (lorax-40.5.18.tar.gz) = df0e0dec433c8dab996119bf523a86b593b5e2c3455bbc90996af948113163096873c1a5de7fc6833f3b6ef5e6c07548c3c72a766a9daf50691a21a60dc75584