diff --git a/scripts/dasharo-deploy b/scripts/dasharo-deploy
index a8123100..d5d67cac 100644
--- a/scripts/dasharo-deploy
+++ b/scripts/dasharo-deploy
@@ -19,6 +19,8 @@ source $DTS_HAL
 [ -z "$SYSTEM_VENDOR" ] && error_exit "SYSTEM_VENDOR not given"
 [ -z "$SYSTEM_MODEL" ] && error_exit "SYSTEM_MODEL not given"
 
+trap 'exit 1' SIGINT
+
 # Variables used in this script:
 # Currently following firmware versions are available: community, community_cap,
 # dpp, dpp_cap, seabios, and heads:
diff --git a/scripts/dts-boot b/scripts/dts-boot
index 958ee58b..1132939c 100644
--- a/scripts/dts-boot
+++ b/scripts/dts-boot
@@ -4,6 +4,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+trap : SIGINT
+
 SBIN_DIR="/usr/sbin"
 FUM_EFIVAR="/sys/firmware/efi/efivars/FirmwareUpdateMode-d15b327e-ff2d-4fc1-abf6-c12bd08c1359"
 
@@ -47,6 +49,6 @@ source $DTS_HAL
 
 if [ -f $FUM_EFIVAR ]; then
     $SBIN_DIR/dasharo-deploy update fum
-else
-    $SBIN_DIR/dts
 fi
+
+$SBIN_DIR/dts