diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index 798271d94f..a62517c6ba 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -299,6 +299,7 @@ build_child_pipeline:
   stage: build
   needs:
     - job: fast_template_app
+      optional: true
       artifacts: false
     - pipeline_variables
     - generate_build_child_pipeline
diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml
index 4282bf7997..ead57430a7 100644
--- a/.gitlab/ci/pre_check.yml
+++ b/.gitlab/ci/pre_check.yml
@@ -152,8 +152,8 @@ pipeline_variables:
     # for non MR pipeline, these are empty lists
     - |
       if [ $IS_MR_PIPELINE == "0" ]; then
-        echo "MR_MODIFIED_FILES=" >> pipeline.env
-        echo "MR_MODIFIED_COMPONENTS=" >> pipeline.env
+        echo "MR_MODIFIED_FILES=\"\"" >> pipeline.env
+        echo "MR_MODIFIED_COMPONENTS=\"\"" >> pipeline.env
       else
         MR_MODIFIED_FILES=$(echo "$GIT_DIFF_OUTPUT" | tr '\n' ';')
         echo "MR_MODIFIED_FILES=\"$MR_MODIFIED_FILES\"" >> pipeline.env