diff --git a/deploy.sh b/deploy.sh
index add9707..adf56ba 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -588,6 +588,9 @@ nixos_generation() {
   sed -i "s|PODMAN_NETWORKS|${PODMAN_NETWORKS}|" final-nix-config/etc/nixos/misc/activation.nix
   sed -i "s|TRAEFIK_NETWORKS|${TRAEFIK_NETWORKS}|" final-nix-config/etc/nixos/podman/traefik.nix
   sed -i "s|TRAEFIK_NETWORKS_REF|${TRAEFIK_NETWORKS_REF}|" final-nix-config/etc/nixos/podman/traefik.nix
+  if [[ ${TARGET_TPM} == "true" ]]; then
+    sed -i "s|#  boot.initrd.systemd.tpm2.enable = true;|  boot.initrd.systemd.tpm2.enable = true;|" final-nix-config/etc/nixos/configuration.nix
+  fi
 }
 
 sum_up() {
@@ -664,8 +667,10 @@ export_configuration() {
   echo "DATA_DISKS_ID=(${DATA_DISKS_ID[@]})"            >> $CONFIG_EXPORT_FILE
   echo "DATA_DISKS_TYPE=(${DATA_DISKS_TYPE[@]})"        >> $CONFIG_EXPORT_FILE
   echo "SPINDOWN_DISKS_ID=(${SPINDOWN_DISKS_ID[@]})"    >> $CONFIG_EXPORT_FILE
-  echo "CONTENT_DISK_NUMBER=$CONTENT_DISK_NUMBER"       >> $CONFIG_EXPORT_FILE
-  echo "PARITY_DISK_NUMBER=$PARITY_DISK_NUMBER"         >> $CONFIG_EXPORT_FILE
+  echo "CONTENT_DISK_NUMBER=${CONTENT_DISK_NUMBER}"     >> $CONFIG_EXPORT_FILE
+  echo "PARITY_DISK_NUMBER=${PARITY_DISK_NUMBER}"       >> $CONFIG_EXPORT_FILE
+  echo "TARGET_TPM=${TARGET_TPM}"                       >> $CONFIG_EXPORT_FILE
+  echo "TARGET_TPM_VERSION=${TARGET_TPM_VERSION:-}"     >> $CONFIG_EXPORT_FILE
 }
 
 deploy() {
@@ -804,7 +809,7 @@ if [[ "$ACTION_ANSWER" == "[1] 🌐 Deploy NixOS on a remote machine" ]]; then
   sum_up
   export_configuration
   deploy
-  postrun_action
+  [[ ${TARGET_TPM} == "true" ]] && postrun_action
   congrats
 
 elif [[ "$ACTION_ANSWER" == "[2] 💽 Deploy NixOS on a remote machine with a file configuration" ]]; then
@@ -825,7 +830,7 @@ elif [[ "$ACTION_ANSWER" == "[2] 💽 Deploy NixOS on a remote machine with a fi
   sum_up
   export_configuration
   deploy
-  postrun_action
+  [[ ${TARGET_TPM} == "true" ]] && postrun_action
   congrats
 
 elif [[ "$ACTION_ANSWER" == "[3] 🛠️ Update a NixOS remote machine" ]]; then