diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index dd85cf0db49..a80a65b4cbb 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -30,7 +30,7 @@ variables:
 
   ALPINE_X86_64_BUILD_TAG: "20250423-rootfs"
   ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
-  ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250529-modules"
+  ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250603-ssh-tweaks"
 
   FEDORA_X86_64_BUILD_TAG: "20250423-rootfs"
 
diff --git a/.gitlab-ci/lava/utils/ssh_job_definition.py b/.gitlab-ci/lava/utils/ssh_job_definition.py
index 2f7f576e844..bdbec772b23 100644
--- a/.gitlab-ci/lava/utils/ssh_job_definition.py
+++ b/.gitlab-ci/lava/utils/ssh_job_definition.py
@@ -77,7 +77,9 @@ lava_ssh_test_case() {
     shift
     lava-test-case \"${test_case}\" --shell \\
         ssh ${SSH_PTY_ARGS:--T} \\
-        -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \\
+        -o StrictHostKeyChecking=no \\
+        -o UserKnownHostsFile=/dev/null \\
+        -o ConnectTimeout=60 \\
         root@$(lava-target-ip) \"${@}\"
 }""",
 ]
diff --git a/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml b/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
index 91876f3c7c6..74fcef8e1b9 100644
--- a/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
+++ b/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
@@ -125,7 +125,9 @@ actions:
                 shift
                 lava-test-case "${test_case}" --shell \
                     ssh ${SSH_PTY_ARGS:--T} \
-                    -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+                    -o StrictHostKeyChecking=no \
+                    -o UserKnownHostsFile=/dev/null \
+                    -o ConnectTimeout=60 \
                     root@$(lava-target-ip) "${@}"
             }
           - lava_ssh_test_case 'wait_for_dut_login' << EOF
diff --git a/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml b/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml
index 0f283df8486..36a400e4d7e 100644
--- a/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml
+++ b/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml
@@ -96,7 +96,9 @@ actions:
                 shift
                 lava-test-case "${test_case}" --shell \
                     ssh ${SSH_PTY_ARGS:--T} \
-                    -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+                    -o StrictHostKeyChecking=no \
+                    -o UserKnownHostsFile=/dev/null \
+                    -o ConnectTimeout=60 \
                     root@$(lava-target-ip) "${@}"
             }
           - lava_ssh_test_case 'wait_for_dut_login' << EOF