diff --git a/_home.macos/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env b/_home.macos/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env
new file mode 120000
index 0000000..117cb13
--- /dev/null
+++ b/_home.macos/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env
@@ -0,0 +1 @@
+../../../_src.posix/private_dot_config/sz.env/000_stop_on_non_interactive_sessions.env
\ No newline at end of file
diff --git a/_home.macos/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env b/_home.macos/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env
deleted file mode 120000
index 8f5aa29..0000000
--- a/_home.macos/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env
+++ /dev/null
@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/sz.env/099_stop_on_non_interactive_sessions.env
\ No newline at end of file
diff --git a/_home.macos/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env b/_home.macos/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env
deleted file mode 120000
index 4cdc0dd..0000000
--- a/_home.macos/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env
+++ /dev/null
@@ -1 +0,0 @@
-../../../_src.posix/private_dot_config/sz.env/remove_000_stop_on_non_interactive_sessions.env
\ No newline at end of file
diff --git a/_src.posix/private_dot_local/bin/executable_tssh-with-tunnel b/_src.posix/private_dot_local/bin/executable_tssh-with-tunnel
index 189a960..6da0438 100644
--- a/_src.posix/private_dot_local/bin/executable_tssh-with-tunnel
+++ b/_src.posix/private_dot_local/bin/executable_tssh-with-tunnel
@@ -30,18 +30,19 @@ SSHUSER="${SSHUSER:-vastdata}"
 
 TARGET="${SSHUSER}@$(tsh-get "$SEARCH" "$SSHUSER")"
 
-VMS="${VMS:-"$(tsh ssh "${TARGET}" -- cat /vast/vman/mgmt-vip)"}"
+VMS="${VMS:-"$(awk '$5 { split($4, cidr, "/"); print cidr[1] }' <(tsh ssh "${TARGET}" bash -l <<SSHEOF
+    VMS="\$(clush -g cnodes 'docker ps | grep vast_vms | grep -v grep' 2>/dev/null | cut -d':' -f1)" \
+    && clush -w "\$VMS" ip -4 -br a
+SSHEOF
+))"}"
 
-TUNNEL="${LOCAL_PORT}:${VMS}:${TARGET_PORT}"
+TUNNEL="-L ${LOCAL_PORT}:${VMS}:${TARGET_PORT}"
 
 RUN="${RUN:-}"
 if [[ -z "$RUN" && -n "$(command -v zellij)" ]]; then
-    RUN="zellij run --floating --pinned 'true' --name '${TUNNEL}|${TARGET}|${SEARCH}|${SCRIPT_NAME}' --"
+    RUN="zellij run --floating --pinned 'true' --name '${SCRIPT_NAME} ${SEARCH}: ${TUNNEL} ${TARGET}' --"
 fi
 
-TUNNEL="-L ${LOCAL_PORT}:${VMS}:${TARGET_PORT}"
-SSH_OPTS="${SSH_OPTS:--N}"
-
 printf "Executing: %s ...\n" "tsh ssh ${TUNNEL} ${TARGET} ${*:2}" >&2
-eval "${RUN} tsh ssh ${SSH_OPTS} ${TUNNEL} '${TARGET}' ${*:2}"
+eval "${RUN} tsh ssh ${TUNNEL} '${TARGET}' ${*:2}"