diff --git a/pkgs/clan-cli/clan_cli/machines/install.py b/pkgs/clan-cli/clan_cli/machines/install.py
index f44dd6713..05fbadc9c 100644
--- a/pkgs/clan-cli/clan_cli/machines/install.py
+++ b/pkgs/clan-cli/clan_cli/machines/install.py
@@ -10,7 +10,11 @@ from tempfile import TemporaryDirectory
 from clan_cli.api import API
 from clan_cli.clan_uri import FlakeId
 from clan_cli.cmd import Log, run
-from clan_cli.completions import add_dynamic_completer, complete_machines
+from clan_cli.completions import (
+    add_dynamic_completer,
+    complete_machines,
+    complete_target_host,
+)
 from clan_cli.facts.generate import generate_facts
 from clan_cli.machines.hardware import HardwareConfig
 from clan_cli.machines.machines import Machine
@@ -233,10 +237,11 @@ def register_install_parser(parser: argparse.ArgumentParser) -> None:
         "--json",
         help="specify the json file for ssh data (generated by starting the clan installer)",
     )
-    group.add_argument(
+    target_host_parser = group.add_argument(
         "--target-host",
         help="ssh address to install to in the form of user@host:2222",
     )
+    add_dynamic_completer(target_host_parser, complete_target_host)
     group.add_argument(
         "-P",
         "--png",
diff --git a/pkgs/clan-cli/clan_cli/machines/update.py b/pkgs/clan-cli/clan_cli/machines/update.py
index 00d0c8a5e..d7d4524f2 100644
--- a/pkgs/clan-cli/clan_cli/machines/update.py
+++ b/pkgs/clan-cli/clan_cli/machines/update.py
@@ -8,7 +8,11 @@ import sys
 from clan_cli.api import API
 from clan_cli.clan_uri import FlakeId
 from clan_cli.cmd import run
-from clan_cli.completions import add_dynamic_completer, complete_machines
+from clan_cli.completions import (
+    add_dynamic_completer,
+    complete_machines,
+    complete_target_host,
+)
 from clan_cli.errors import ClanError
 from clan_cli.facts.generate import generate_facts
 from clan_cli.facts.upload import upload_secrets
@@ -217,11 +221,13 @@ def register_update_parser(parser: argparse.ArgumentParser) -> None:
         help="Host key (.ssh/known_hosts) check mode.",
     )
 
-    parser.add_argument(
+    target_host_parser = parser.add_argument(
         "--target-host",
         type=str,
         help="Address of the machine to update, in the format of user@host:1234.",
     )
+    add_dynamic_completer(target_host_parser, complete_target_host)
+
     parser.add_argument(
         "--darwin",
         type=str,