diff --git a/README.md b/README.md
index 9ba84e7..b9f8c64 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@
     - [Create Token](#create-token)
     - [Initialize Packer](#initialize-packer)
   - [Build](#build)
+  - [Build LUKS encrypted Templates](#build-luks-encrypted-templates)
   - [Setup new templates](#setup-new-templates)
   - [ToDo](#todo)
 
@@ -19,10 +20,10 @@
 ❯ la 4 -I .git
 Name
  ./
-├──  _scripts/                                                                   Support scripts for building templates
-│   └──  unlock-luks-after-install.py*                                           Unlocks the LUKS encrypted Disk on the 1st Boot after installation
+├──  _scripts/                                                                   Support scripts for building templates.
+│   └──  unlock-luks-after-install.py*                                           Unlocks the LUKS encrypted Disk on the 1st Boot after installation.
 ├──  debian/                                                                     Debian template definitions and assets (Packer templates, cloud-init/KS files, provisioning files).
-│   └──  13-trixie/                                                              Template definition and assets for the Trixie template.
+│   └──  13-trixie-luks/                                                         Template definition and assets for the Trixie template.
 │       ├──  files/                                                              Files used for the file provisioner.
 │       │   ├── 󱁻 99-pve.cfg                                                      Configures the data sources for cloud-init.
 │       │   └──  debian.sources                                                  Debian package sources.
@@ -33,7 +34,9 @@ Name
 │       ├──  credentials.auto.pkrvars.hcl -> ../../credentials.auto.pkrvars.hcl  Local secrets for Packer (API token, endpoints) used at build time.
 │       ├──  debian-trixie.pkr.hcl                                               The build template.
 │       ├──  variables-common.pkr.hcl -> ../../variables-common.pkr.hcl          Shared Packer variables used by templates.
-│       └──  variables.pkr.hcl                                                   Packer variables only used for this template
+│       └──  variables.pkr.hcl                                                   Packer variables only used for this template.
+├──  OS/                                                                         Diretory to group templates for a specific OS.
+│   └──  version_number[-version_codename][-luks]/                               Template definition and assets.
 ├──  downloaded_iso_path/                                                        Packer ISO cache directory (downloaded ISOs and lock files).
 │   ├──  OS.iso
 │   ├──  OS.iso.lock
@@ -49,9 +52,9 @@ Name
 
 ## Templates
 
-| Template ID | OS                                                                                             | Version   | Path               | LUKS encrypted? | Mac Address       | IP Address              |
-| :---------- | :--------------------------------------------------------------------------------------------- | :-------- | :----------------- | :-------------- | :---------------- | :---------------------- |
-| 65000       | <img src="https://www.debian.org/logos/openlogo-nd.svg" alt="Debian logo" height="16"/> Debian | 13-trixie | `debian/13-trixie` | ✅              | BC:24:11:00:13:37 | 192.168.9.29 (via DHCP) |
+| Template ID | OS                                                                                             | Version   | Path                    | LUKS encrypted? | Mac Address       | IP Address              |
+| :---------- | :--------------------------------------------------------------------------------------------- | :-------- | :---------------------- | :-------------- | :---------------- | :---------------------- |
+| 65000       | <img src="https://www.debian.org/logos/openlogo-nd.svg" alt="Debian logo" height="16"/> Debian | 13-trixie | `debian/13-trixie-luks` | ✅              | BC:24:11:00:13:37 | 192.168.9.29 (via DHCP) |
 
 ## Initial Setup
 
@@ -86,6 +89,14 @@ To build a template run:
 mise run build <path-to-template-directory>
 ```
 
+## Build LUKS encrypted Templates
+
+To build a template run:
+
+```shell
+mise run build-luks <path-to-template-directory>
+```
+
 ## Setup new templates
 
 Run:
diff --git a/debian/13-trixie/credentials.auto.pkrvars.hcl b/debian/13-trixie-luks/credentials.auto.pkrvars.hcl
similarity index 100%
rename from debian/13-trixie/credentials.auto.pkrvars.hcl
rename to debian/13-trixie-luks/credentials.auto.pkrvars.hcl
diff --git a/debian/13-trixie/debian-trixie.pkr.hcl b/debian/13-trixie-luks/debian-trixie.pkr.hcl
similarity index 100%
rename from debian/13-trixie/debian-trixie.pkr.hcl
rename to debian/13-trixie-luks/debian-trixie.pkr.hcl
diff --git a/debian/13-trixie/files/99-pve.cfg b/debian/13-trixie-luks/files/99-pve.cfg
similarity index 100%
rename from debian/13-trixie/files/99-pve.cfg
rename to debian/13-trixie-luks/files/99-pve.cfg
diff --git a/debian/13-trixie/files/debian.sources b/debian/13-trixie-luks/files/debian.sources
similarity index 100%
rename from debian/13-trixie/files/debian.sources
rename to debian/13-trixie-luks/files/debian.sources
diff --git a/debian/13-trixie/http/meta-data b/debian/13-trixie-luks/http/meta-data
similarity index 100%
rename from debian/13-trixie/http/meta-data
rename to debian/13-trixie-luks/http/meta-data
diff --git a/debian/13-trixie/http/preseed.cfg b/debian/13-trixie-luks/http/preseed.cfg
similarity index 100%
rename from debian/13-trixie/http/preseed.cfg
rename to debian/13-trixie-luks/http/preseed.cfg
diff --git a/debian/13-trixie/http/user-data b/debian/13-trixie-luks/http/user-data
similarity index 100%
rename from debian/13-trixie/http/user-data
rename to debian/13-trixie-luks/http/user-data
diff --git a/debian/13-trixie/variables-common.pkr.hcl b/debian/13-trixie-luks/variables-common.pkr.hcl
similarity index 100%
rename from debian/13-trixie/variables-common.pkr.hcl
rename to debian/13-trixie-luks/variables-common.pkr.hcl
diff --git a/debian/13-trixie/variables.pkr.hcl b/debian/13-trixie-luks/variables.pkr.hcl
similarity index 100%
rename from debian/13-trixie/variables.pkr.hcl
rename to debian/13-trixie-luks/variables.pkr.hcl