diff --git a/senza/cli.py b/senza/cli.py
index e20c744..15927fd 100755
--- a/senza/cli.py
+++ b/senza/cli.py
@@ -985,11 +985,13 @@ def instances(stack_ref, all, terminated, docker_image, piu, odd_host, region,
 
         if piu is not None:
             odd_host = odd_host or Piu.find_odd_host(region)
+            auto_connect = len(rows) == 1
             for row in rows:
                 if row['private_ip'] is not None:
                     Piu.request_access(instance=row['private_ip'],
                                        reason=piu,
-                                       odd_host=odd_host)
+                                       odd_host=odd_host,
+                                       connect=auto_connect)
 
 
 @cli.command()
diff --git a/senza/stups/piu.py b/senza/stups/piu.py
index 3d1784a..643ac93 100644
--- a/senza/stups/piu.py
+++ b/senza/stups/piu.py
@@ -13,13 +13,18 @@ class Piu:
     http://stups.readthedocs.io/en/latest/user-guide/ssh-access.html#ssh-access
     """
     @staticmethod
-    def request_access(instance: str, reason: str, odd_host: Optional[str]):
+    def request_access(instance: str, reason: str, odd_host: Optional[str],
+                       connect: bool):
         """
         Request SSH access to a single host
         """
         reason = '{} via senza'.format(reason)
-        cmd = ['piu', 'request-access', '--connect',
+        cmd = ['piu', 'request-access',
                instance, reason]
+
+        if connect:
+            cmd.append('--connect')
+
         if odd_host is not None:
             cmd.extend(['-O', odd_host])
 

Please set the --connect option as optional
After 479e4d8 you connect automatically to ***all*** instances if you use `--piu`

But this is not useful, if you get more then one instance back.
diff --git a/tests/test_stups/test_piu.py b/tests/test_stups/test_piu.py
index 125a016..447b2bf 100644
--- a/tests/test_stups/test_piu.py
+++ b/tests/test_stups/test_piu.py
@@ -9,14 +9,21 @@ def test_request_access(monkeypatch):
     m_call = MagicMock()
     monkeypatch.setattr('senza.stups.piu.call', m_call)
 
-    Piu.request_access('127.0.0.1', 'no reason', None)
-    m_call.assert_called_once_with(['piu', 'request-access', '--connect',
+    Piu.request_access('127.0.0.1', 'no reason', None, True)
+    m_call.assert_called_once_with(['piu', 'request-access',
+                                    '127.0.0.1', 'no reason via senza',
+                                    '--connect'])
+
+    m_call.reset_mock()
+    Piu.request_access('127.0.0.1', 'no reason', None, False)
+    m_call.assert_called_once_with(['piu', 'request-access',
                                     '127.0.0.1', 'no reason via senza'])
 
     m_call.reset_mock()
-    Piu.request_access('127.0.0.1', 'no reason', 'example.com')
-    m_call.assert_called_once_with(['piu', 'request-access', '--connect',
+    Piu.request_access('127.0.0.1', 'no reason', 'example.com', True)
+    m_call.assert_called_once_with(['piu', 'request-access',
                                     '127.0.0.1', 'no reason via senza',
+                                    '--connect',
                                     '-O', 'example.com'])
 
 
@@ -56,6 +63,7 @@ def test_request_access_not_installed(monkeypatch):
     monkeypatch.setattr('senza.stups.piu.call', m_call)
 
     with pytest.raises(PiuNotFound):
-        Piu.request_access('127.0.0.1', 'no reason', None)
-    m_call.assert_called_once_with(['piu', 'request-access', '--connect',
-                                    '127.0.0.1', 'no reason via senza'])
+        Piu.request_access('127.0.0.1', 'no reason', None, True)
+    m_call.assert_called_once_with(['piu', 'request-access',
+                                    '127.0.0.1', 'no reason via senza',
+                                    '--connect'])

pip install -e .
parse_log_pytest
requirements.txt
pytest pytest-cov
3.9
requirements.txt
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
boto3==1.37.23
botocore==1.37.23
certifi==2025.1.31
charset-normalizer==3.4.1
click==8.1.8
clickclick==20.10.2
coverage==7.8.0
dnspython==1.15.0
dnspython3==1.15.0
exceptiongroup==1.2.2
idna==3.10
importlib_metadata==8.6.1
iniconfig==2.1.0
jmespath==1.0.1
packaging==24.2
pluggy==1.5.0
pystache==0.6.8
pytest==8.3.5
pytest-cov==6.0.0
python-dateutil==2.9.0.post0
PyYAML==6.0.2
requests==2.32.3
s3transfer==0.11.4
six==1.17.0
stups-cli-support==1.1.22
stups-pierone==1.1.56
-e git+https://github.com/zalando-stups/senza.git@e40cebaeb29bf5af792b8aa79627f7e5ce9a72fa#egg=stups_senza
stups-tokens==1.1.19
stups-zign==1.2
tomli==2.2.1
typing==3.7.4.3
urllib3==1.26.20
zipp==3.21.0

name: senza
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.4.4=h6a678d5_1
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=3.0.16=h5eee18b_0
  - pip=25.0=py39h06a4308_0
  - python=3.9.21=he870216_1
  - readline=8.2=h5eee18b_0
  - setuptools=75.8.0=py39h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - tzdata=2025a=h04d1e81_0
  - wheel=0.45.1=py39h06a4308_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - boto3==1.37.23
      - botocore==1.37.23
      - certifi==2025.1.31
      - charset-normalizer==3.4.1
      - click==8.1.8
      - clickclick==20.10.2
      - coverage==7.8.0
      - dnspython==1.15.0
      - dnspython3==1.15.0
      - exceptiongroup==1.2.2
      - idna==3.10
      - importlib-metadata==8.6.1
      - iniconfig==2.1.0
      - jmespath==1.0.1
      - packaging==24.2
      - pluggy==1.5.0
      - pystache==0.6.8
      - pytest==8.3.5
      - pytest-cov==6.0.0
      - python-dateutil==2.9.0.post0
      - pyyaml==6.0.2
      - requests==2.32.3
      - s3transfer==0.11.4
      - six==1.17.0
      - stups-cli-support==1.1.22
      - stups-pierone==1.1.56
      - stups-tokens==1.1.19
      - stups-zign==1.2
      - tomli==2.2.1
      - typing==3.7.4.3
      - urllib3==1.26.20
      - zipp==3.21.0
prefix: /opt/conda/envs/senza

tests/test_stups/test_piu.py::test_request_access tests/test_stups/test_piu.py::test_request_access_not_installed
tests/test_stups/test_piu.py::test_find_odd_host
senza/cli.py senza/stups/piu.py
senza/cli.py senza/stups/piu.py