diff --git a/script/host/zfs/composition-sync/sync.sh b/script/host/zfs/composition-sync/sync.sh
index 97b8e50..a588603 100755
--- a/script/host/zfs/composition-sync/sync.sh
+++ b/script/host/zfs/composition-sync/sync.sh
@@ -95,7 +95,7 @@ function receive() {
     base.set _SOURCEHOST "$(composition.printRunningHost "${_COMPOSITION}")" '^[a-zA-Z0-9][a-zA-Z0-9.-]*$'
     _SSH_PORT=$(head -n 1 "${CIS[DOMAINDEFINITIONS]:?"Missing CIS_DOMAINDEFINITIONS"}compositions/${_COMPOSITION}/ssh-port" 2> /dev/null)
     base.set _SSH_PORT "${_SSH_PORT:-22}" '^[1-9][0-9]{1,4}$'
-    _SSH_COMMAND="ssh -p ${_SSH_PORT} -o ConnectTimeout=20 -o ServerAliveInterval=15 -C composition-sync@${_SOURCEHOST}"
+    _SSH_COMMAND="ssh -n -p ${_SSH_PORT} -o ConnectTimeout=20 -o ServerAliveInterval=15 -C composition-sync@${_SOURCEHOST}"
     _SEND_SCRIPT="${CIS[SCRIPTSROOT]:?"Missing CIS_SCRIPTSROOT"}host/zfs/composition-sync/sync-send.sh"
     _ZFS_BACKUP="$(composition.printZfs "${_COMPOSITION}")-BACKUP"
     readonly _RECEIVERHOST _COMPOSITION _SSH_COMMAND _SEND_SCRIPT _ZFS_BACKUP
diff --git a/script/host/zfs/snapshot.sh b/script/host/zfs/snapshot.sh
index 2a05479..aa82f18 100755
--- a/script/host/zfs/snapshot.sh
+++ b/script/host/zfs/snapshot.sh
@@ -14,7 +14,7 @@ function cleanup() {
     readonly _KEEP_MINUTELY _KEEP_HOURLY _KEEP_DAILY _KEEP_MONTHLY
 
     local _COMPOSITION _ZFS
-    composition.printAll | while read -r _COMPOSITION; do
+    { composition.printAllRunningOnThisHost; composition.printAllSyncedByThisHost; } | while read -r _COMPOSITION; do
 
         _ZFS="$(composition.printZfsVerified "${_COMPOSITION}")"
         [ -n "${_ZFS}" ] \