diff --git a/lava_test_plans/include/boot_target/boot_target.jinja2 b/lava_test_plans/include/boot_target/boot_target.jinja2
new file mode 100644
index 00000000..976ad6a5
--- /dev/null
+++ b/lava_test_plans/include/boot_target/boot_target.jinja2
@@ -0,0 +1,31 @@
+{## NOTE: PLEASE DON'T ADD BLOCK HERE, AS ONLY THE RENDERED CONTENTS  ##}
+{## WILL BE RETURNED WHEN INCLUDED, WHICH DOES NOT HAVE THE BLOCK     ##}
+{## DEFINITION THEN, THE OVERRIDING CALLED AT OTHER PLACES WON'T WORK ##}
+
+{% if kernel_start_message is defined and kernel_start_message %}
+    parameters:
+      kernel-start-message: {{ kernel_start_message }}
+{% endif %}
+{% if lxc_project == true %}
+    namespace: target
+{% endif %}
+{% include "include/boot_target/boot_os_prompt.jinja2" %}
+{% include "include/boot_target/timeout_and_method.jinja2" %}
+{% if FASTBOOT_COMMANDS is defined %}
+    commands:
+{% for fcmd in FASTBOOT_COMMANDS %}
+      - {{ fcmd }}
+{% endfor %}
+{% endif %}
+{% if lxc_project == true and pre_os_command is defined and pre_os_command == true %}
+    protocols:
+      lava-lxc:
+      - action: auto-login-action
+        request: pre-os-command
+        timeout:
+          minutes: 2
+{% endif %}
+{% if DOCKER_IMAGE_BOOT is defined %}
+    docker:
+      image: {{DOCKER_IMAGE_BOOT}}
+{% endif %}
diff --git a/lava_test_plans/include/fastboot.jinja2 b/lava_test_plans/include/fastboot.jinja2
index 887a84a4..6bf7ea38 100644
--- a/lava_test_plans/include/fastboot.jinja2
+++ b/lava_test_plans/include/fastboot.jinja2
@@ -270,13 +270,6 @@ reboot_to_fastboot: {{ reboot_to_fastboot }}
 
 {% block boot_target %}
 - boot:
-{% if kernel_start_message is defined and kernel_start_message %}
-    parameters:
-      kernel-start-message: {{ kernel_start_message }}
-{% endif %}
-{% if lxc_project == true %}
-    namespace: target
-{% endif %}
 {% block boot_commands %}
 {% endblock boot_commands %}
 {% if auto_login == true %}
@@ -285,26 +278,7 @@ reboot_to_fastboot: {{ reboot_to_fastboot }}
 {% include "include/boot_target/auto_login_commands.jinja2" %}
 {% endblock auto_login_commands %}
 {% endif %}
-{% include "include/boot_target/boot_os_prompt.jinja2" %}
-{% include "include/boot_target/timeout_and_method.jinja2" %}
-{% if FASTBOOT_COMMANDS is defined %}
-    commands:
-{% for fcmd in FASTBOOT_COMMANDS %}
-      - {{ fcmd }}
-{% endfor %}
-{% endif %}
-{% if lxc_project == true and pre_os_command is defined and pre_os_command == true %}
-    protocols:
-      lava-lxc:
-      - action: auto-login-action
-        request: pre-os-command
-        timeout:
-          minutes: 2
-{% endif %}
-{% if DOCKER_IMAGE_BOOT is defined %}
-    docker:
-      image: {{DOCKER_IMAGE_BOOT}}
-{% endif %}
+{% include "include/boot_target/boot_target.jinja2" %}
 {% endblock boot_target %}
 
 {% block post_boot_command %}