diff --git a/src/tm_mad/ceph/cpds.ssh b/src/tm_mad/ceph/cpds.ssh
index c2239c6e59..dd53f0b495 100755
--- a/src/tm_mad/ceph/cpds.ssh
+++ b/src/tm_mad/ceph/cpds.ssh
@@ -112,9 +112,9 @@ fi
 
 COPY_CMD=$(cat <<EOF
     if virsh -c $LIBVIRT_URI domfsfreeze $DEPLOY_ID ; then
-        trap "virsh -c $LIBVIRT_URI domfsthaw $DEPLOY_ID" EXIT TERM INT HUP
+        trap "virsh -c $LIBVIRT_URI domfsthaw $DEPLOY_ID" EXIT
     elif virsh -c $LIBVIRT_URI suspend $DEPLOY_ID; then
-        trap "virsh -c $LIBVIRT_URI resume $DEPLOY_ID" EXIT TERM INT HUP
+        trap "virsh -c $LIBVIRT_URI resume $DEPLOY_ID" EXIT
     else
         echo "Could not domfsfreeze or suspend domain" >&2
         exit 1
diff --git a/src/tm_mad/ceph/snap_create_live b/src/tm_mad/ceph/snap_create_live
index 51de54b26a..579953ed76 100755
--- a/src/tm_mad/ceph/snap_create_live
+++ b/src/tm_mad/ceph/snap_create_live
@@ -108,7 +108,7 @@ SNAP_CREATE_CMD=$(cat <<EOF
     set -e -o pipefail
 
     if virsh -c $LIBVIRT_URI domfsfreeze $DEPLOY_ID ; then
-        trap "virsh -c $LIBVIRT_URI domfsthaw $DEPLOY_ID" EXIT TERM INT HUP
+        trap "virsh -c $LIBVIRT_URI domfsthaw $DEPLOY_ID" EXIT
     fi
 
     RBD="${RBD}"
diff --git a/src/tm_mad/qcow2/cpds b/src/tm_mad/qcow2/cpds
index 4c92dbba14..858dd63d51 100755
--- a/src/tm_mad/qcow2/cpds
+++ b/src/tm_mad/qcow2/cpds
@@ -98,9 +98,9 @@ if [ "${LCM_STATE}" = '26' ] && [ "${SNAP_ID}" = '-1' ]; then
 touch ${DST_PATH}
 if ! virsh -c ${LIBVIRT_URI} blockcopy ${DEPLOY_ID} ${DISK_TARGET} ${DST_PATH} --wait --finish; then
     if virsh -c ${LIBVIRT_URI} domfsfreeze ${DEPLOY_ID}; then
-        trap "virsh -c ${LIBVIRT_URI} domfsthaw ${DEPLOY_ID}" EXIT TERM INT HUP
+        trap "virsh -c ${LIBVIRT_URI} domfsthaw ${DEPLOY_ID}" EXIT
     elif virsh -c ${LIBVIRT_URI} suspend ${DEPLOY_ID}; then
-        trap "virsh -c ${LIBVIRT_URI} resume ${DEPLOY_ID}" EXIT TERM INT HUP
+        trap "virsh -c ${LIBVIRT_URI} resume ${DEPLOY_ID}" EXIT
     else
         echo "Could not domfsfreeze or suspend domain" >&2
         exit 1
diff --git a/src/tm_mad/qcow2/cpds.ssh b/src/tm_mad/qcow2/cpds.ssh
index 6d1c970fbf..bdc9a2832c 100755
--- a/src/tm_mad/qcow2/cpds.ssh
+++ b/src/tm_mad/qcow2/cpds.ssh
@@ -93,9 +93,9 @@ if [ "${LCM_STATE}" = '26' ] && [ "${SNAP_ID}" = '-1' ]; then
 touch ${DST_PATH}
 if ! virsh -c ${LIBVIRT_URI} blockcopy ${DEPLOY_ID} ${DISK_TARGET} ${DST_PATH} --wait --finish; then
     if virsh -c ${LIBVIRT_URI} domfsfreeze ${DEPLOY_ID}; then
-        trap "virsh -c ${LIBVIRT_URI} domfsthaw ${DEPLOY_ID}" EXIT TERM INT HUP
+        trap "virsh -c ${LIBVIRT_URI} domfsthaw ${DEPLOY_ID}" EXIT
     elif virsh -c ${LIBVIRT_URI} suspend ${DEPLOY_ID}; then
-        trap "virsh -c ${LIBVIRT_URI} resume ${DEPLOY_ID}" EXIT TERM INT HUP
+        trap "virsh -c ${LIBVIRT_URI} resume ${DEPLOY_ID}" EXIT
     else
         echo "Could not domfsfreeze or suspend domain" >&2
         exit 1
diff --git a/src/tm_mad/qcow2/snap_create_live b/src/tm_mad/qcow2/snap_create_live
index 095b56c036..00a16c66b2 100755
--- a/src/tm_mad/qcow2/snap_create_live
+++ b/src/tm_mad/qcow2/snap_create_live
@@ -136,9 +136,9 @@ FILENAME="/tmp/snapshot-$VMID-$DISK_ID-$SNAP_ID"
 echo "$DOC" > \$FILENAME
 
 if virsh -c $LIBVIRT_URI domfsfreeze $DEPLOY_ID ; then
-    trap "virsh -c $LIBVIRT_URI domfsthaw $DEPLOY_ID" EXIT TERM INT HUP
+    trap "virsh -c $LIBVIRT_URI domfsthaw $DEPLOY_ID" EXIT
 elif virsh -c $LIBVIRT_URI suspend $DEPLOY_ID; then
-    trap "virsh -c $LIBVIRT_URI resume $DEPLOY_ID" EXIT TERM INT HUP
+    trap "virsh -c $LIBVIRT_URI resume $DEPLOY_ID" EXIT
 else
     echo "Could not domfsfreeze or suspend domain" >&2
     exit 1
diff --git a/src/tm_mad/qcow2/snap_create_live.ssh b/src/tm_mad/qcow2/snap_create_live.ssh
index 20a3d35794..683f3d8759 100755
--- a/src/tm_mad/qcow2/snap_create_live.ssh
+++ b/src/tm_mad/qcow2/snap_create_live.ssh
@@ -126,9 +126,9 @@ FILENAME="/tmp/snapshot-$VMID-$DISK_ID-$SNAP_ID"
 echo "$DOC" > \$FILENAME
 
 if virsh -c $LIBVIRT_URI domfsfreeze $DEPLOY_ID ; then
-    trap "virsh -c $LIBVIRT_URI domfsthaw $DEPLOY_ID" EXIT TERM INT HUP
+    trap "virsh -c $LIBVIRT_URI domfsthaw $DEPLOY_ID" EXIT
 elif virsh -c $LIBVIRT_URI suspend $DEPLOY_ID; then
-    trap "virsh -c $LIBVIRT_URI resume $DEPLOY_ID" EXIT TERM INT HUP
+    trap "virsh -c $LIBVIRT_URI resume $DEPLOY_ID" EXIT
 else
     echo "Could not domfsfreeze or suspend domain" >&2
     exit 1
diff --git a/src/tm_mad/ssh/cpds b/src/tm_mad/ssh/cpds
index 35cc6f3545..57570fcf85 100755
--- a/src/tm_mad/ssh/cpds
+++ b/src/tm_mad/ssh/cpds
@@ -107,10 +107,10 @@ if ! retry_if "active block job" 3 5 virsh -c ${LIBVIRT_URI} blockcopy ${DEPLOY_
     set -e -o pipefail
 
     if virsh -c ${LIBVIRT_URI} domfsfreeze ${DEPLOY_ID}; then
-        trap "virsh -c ${LIBVIRT_URI} domfsthaw ${DEPLOY_ID}" EXIT TERM INT HUP
+        trap "virsh -c ${LIBVIRT_URI} domfsthaw ${DEPLOY_ID}" EXIT
         $CP $SRC_PATH $SRC_TEMP_PATH
     elif virsh -c ${LIBVIRT_URI} suspend ${DEPLOY_ID}; then
-        trap "virsh -c ${LIBVIRT_URI} resume ${DEPLOY_ID}" EXIT TERM INT HUP
+        trap "virsh -c ${LIBVIRT_URI} resume ${DEPLOY_ID}" EXIT
         $CP $SRC_PATH $SRC_TEMP_PATH
     else
         echo "Could not domfsfreeze or suspend domain" >&2
diff --git a/src/tm_mad/ssh/mv b/src/tm_mad/ssh/mv
index 967d5d1509..b2f36def93 100755
--- a/src/tm_mad/ssh/mv
+++ b/src/tm_mad/ssh/mv
@@ -78,7 +78,7 @@ MONITOR=$(ssh_monitor_and_log "$SRC_HOST" "$MONITOR_CMD" 'Get .monitor')
 ssh_make_path "$DST_HOST" "$DST_PATH" "$MONITOR"
 
 RANDOM_FILE=$(ssh "$DST_HOST" "mktemp -p \"$DST_DIR\"")
-trap "ssh $DST_HOST \"rm -f $RANDOM_FILE\"" EXIT TERM INT HUP
+trap "ssh $DST_HOST \"rm -f $RANDOM_FILE\"" EXIT
 if ssh "$SRC_HOST" "test -f $RANDOM_FILE"; then
     log "Not moving $SRC to $DST, they are the same path"
     exit 0
diff --git a/src/vmm_mad/remotes/kvm/migrate b/src/vmm_mad/remotes/kvm/migrate
index d5e04737d5..6f53f1266a 100755
--- a/src/vmm_mad/remotes/kvm/migrate
+++ b/src/vmm_mad/remotes/kvm/migrate
@@ -177,12 +177,12 @@ else
     if [ -n "$RAW_DISKS" ]; then
         if virsh --connect $LIBVIRT_URI domfsfreeze $DEPLOY_ID; then
             # local domfsthaw for the case migration fails
-            trap "virsh --connect $LIBVIRT_URI domfsthaw $DEPLOY_ID" EXIT TERM INT HUP
+            trap "virsh --connect $LIBVIRT_URI domfsthaw $DEPLOY_ID" EXIT
             FREEZE="yes"
         else
             if virsh --connect $LIBVIRT_URI suspend $DEPLOY_ID; then
                 # local resume for the case migration fails
-                trap "virsh --connect $LIBVIRT_URI resume $DEPLOY_ID" EXIT TERM INT HUP
+                trap "virsh --connect $LIBVIRT_URI resume $DEPLOY_ID" EXIT
                 SUSPEND="yes"
             else
                 error_message "Could not freeze or suspend the domain"
diff --git a/src/vmm_mad/remotes/lib/firecracker/map_context b/src/vmm_mad/remotes/lib/firecracker/map_context
index 6310482872..6e155c7588 100755
--- a/src/vmm_mad/remotes/lib/firecracker/map_context
+++ b/src/vmm_mad/remotes/lib/firecracker/map_context
@@ -31,7 +31,7 @@ NEW_DISK=$(mktemp "${DISK_SRC}.XXXXXX")
 NEW_DBFS=$(mktemp "${DISK_SRC}.XXXXXX")
 chmod go-rwx "${NEW_EXTR}" "${NEW_DISK}" "${NEW_DBFS}"
 
-trap 'rm -rf "${NEW_EXTR}" "${NEW_DISK}" "${NEW_DBFS}"' EXIT TERM INT HUP
+trap 'rm -rf "${NEW_EXTR}" "${NEW_DISK}" "${NEW_DBFS}"' EXIT
 
 debugfs_do()
 {