diff --git a/scripts/bld-deploy-remote.py b/scripts/bld-deploy-remote.py
index e208083..097716c 100755
--- a/scripts/bld-deploy-remote.py
+++ b/scripts/bld-deploy-remote.py
@@ -5,11 +5,12 @@ import argparse
 import os
 import sys
 import time
+import platform
 from typing import Final
 
 
-# TODO: Should we make this configurable?
 BUILDER = "cross"
+USE_SSHPASS = False
 
 # This script can easily be adapted to other remote machines, Linux boards and
 # remote configurations by tweaking / hardcoding these parameter, which generally are constant
@@ -142,8 +143,8 @@ def bld_deploy_run(args):
     # ssh_target_ident = f"{args.user}@{args.address}"
     ssh_target_ident = "small_flatsat"
     sshpass_cmd = ""
-    # if platform.system() != "Windows":
-    # sshpass_cmd = f"sshpass {sshpass_args}"
+    if USE_SSHPASS and platform.system() != "Windows":
+        sshpass_cmd = f"sshpass {sshpass_args}"
     dest_path = f"{args.dest}/{args.app}"
     if not args.source:
         source_path = f"{os.getcwd()}/target/{args.tc}/{build_folder}/{args.app}"