diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index d0d30a07566..7313fed72d2 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -30,7 +30,7 @@ variables:
 
   ALPINE_X86_64_BUILD_TAG: "20250722-libwayland"
   ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
-  ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250717-lava"
+  ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250717-heredoc"
 
   FEDORA_X86_64_BUILD_TAG: "20250722-libwayland"
 
diff --git a/.gitlab-ci/lava/tests/data/FASTBOOT_force_uart=False_job_definition.yaml b/.gitlab-ci/lava/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
index 13f1b21ef44..3ee8d4b3e3e 100644
--- a/.gitlab-ci/lava/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
+++ b/.gitlab-ci/lava/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
@@ -130,9 +130,10 @@ actions:
                     -o ConnectTimeout=60 \
                     root@$(lava-target-ip) "${@}"
             }
-          - lava_ssh_test_case 'wait_for_dut_login' << EOF
-          - while [ ! -e /dut_ready ]; do sleep 1; done;
-          - EOF
+          - |-
+            lava_ssh_test_case 'wait_for_dut_login' << EOF
+            while [ ! -e /dut_ready ]; do sleep 1; done;
+            EOF
           - |-
             lava_ssh_test_case 'artifact_download' 'bash --' << EOF
             source /dut-env-vars.sh
diff --git a/.gitlab-ci/lava/tests/data/UBOOT_force_uart=False_job_definition.yaml b/.gitlab-ci/lava/tests/data/UBOOT_force_uart=False_job_definition.yaml
index 4eddf348150..2e7b260d106 100644
--- a/.gitlab-ci/lava/tests/data/UBOOT_force_uart=False_job_definition.yaml
+++ b/.gitlab-ci/lava/tests/data/UBOOT_force_uart=False_job_definition.yaml
@@ -101,9 +101,10 @@ actions:
                     -o ConnectTimeout=60 \
                     root@$(lava-target-ip) "${@}"
             }
-          - lava_ssh_test_case 'wait_for_dut_login' << EOF
-          - while [ ! -e /dut_ready ]; do sleep 1; done;
-          - EOF
+          - |-
+            lava_ssh_test_case 'wait_for_dut_login' << EOF
+            while [ ! -e /dut_ready ]; do sleep 1; done;
+            EOF
           - |-
             lava_ssh_test_case 'artifact_download' 'bash --' << EOF
             source /dut-env-vars.sh
diff --git a/.gitlab-ci/lava/utils/ssh_job_definition.py b/.gitlab-ci/lava/utils/ssh_job_definition.py
index bdbec772b23..99759465b9b 100644
--- a/.gitlab-ci/lava/utils/ssh_job_definition.py
+++ b/.gitlab-ci/lava/utils/ssh_job_definition.py
@@ -160,9 +160,13 @@ def generate_docker_test(
 
     docker_commands += [
         to_yaml_block(DOCKER_COMMANDS, escape_vars=["LAVA_TARGET_IP"]),
-        "lava_ssh_test_case 'wait_for_dut_login' << EOF",
-        "while [ ! -e /dut_ready ]; do sleep 1; done;",
-        "EOF",
+        to_yaml_block(
+            (
+                "lava_ssh_test_case 'wait_for_dut_login' << EOF",
+                "while [ ! -e /dut_ready ]; do sleep 1; done;",
+                "EOF",
+            )
+        ),
         to_yaml_block(
             (
                 "lava_ssh_test_case 'artifact_download' 'bash --' << EOF",