diff --git a/keepercommander/commands/tunnel_and_connections.py b/keepercommander/commands/tunnel_and_connections.py
index e664ba7ee..2f6a5b023 100644
--- a/keepercommander/commands/tunnel_and_connections.py
+++ b/keepercommander/commands/tunnel_and_connections.py
@@ -936,7 +936,7 @@ def execute(self, params, **kwargs):
         output_format = kwargs.get('format', 'table')
         test_filter = kwargs.get('test_filter')
 
-        server = params.server  # e.g. "keepersecurity.com"
+        server = 'keepersecurity.us' if params.server == 'govcloud.keepersecurity.us' else params.server  # e.g. "keepersecurity.com"
         krelay_server = os.environ.get('KRELAY_URL') or f'krelay.{server}'
         connect_host = f'connect.{server}'
 
@@ -944,7 +944,7 @@ def execute(self, params, **kwargs):
         self._print_header()
         print()
         now = datetime.datetime.utcnow()
-        region_label = 'US' if server == 'keepersecurity.com' else server.split('.')[0].upper()
+        region_label = 'US' if server == 'keepersecurity.com' else 'GOVCLOUD' if server == 'keepersecurity.us' else server.split('.')[-1].upper()
         print(self._green(f'  Region  {region_label}  \u00b7  {server}'))
         print(self._green(f'  Date    {now.strftime("%Y-%m-%d  %H:%M")} UTC'))
         if record_name:
@@ -1029,7 +1029,7 @@ def _record(name: str, passed: bool, detail: str, ms: int):
         print(row.rstrip())
 
         passed_ports = sum(1 for _, ok, _ in port_results if ok)
-        print(f'    {self._check()}  {self._green(str(passed_ports))}/{len(port_results)} sampled ports reachable')
+        print(f'    {self._check()}'+self._green(f'  {str(passed_ports)}/{len(port_results)} sampled ports reachable'))
         print()
 
         # ── section 4: WebRTC connectivity (Rust library) ─────────────────────
@@ -1325,9 +1325,6 @@ def _val(v):
         print(f'  {self._dsep()}')
         print()
 
-        return 0 if passed_total == total_checks else 1
-
-
 class PAMConnectionEditCommand(Command):
     choices = ['on', 'off', 'default']
     protocols = ['', 'http', 'kubernetes', 'mysql', 'postgresql', 'rdp', 'sql-server', 'ssh', 'telnet', 'vnc']