diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0495f885e1b0d..9468d9ab1806f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -348,10 +348,18 @@ jobs:
             export ARTIFACTDIR=`pwd`/buildartifacts
 
             for i in 1 2 3; do
-              python -m pip install \
+              if python -m pip install \
                 --default-timeout=100 \
                 --retries 10 \
-                ntfc==0.0.1 && break
+                git+https://github.com/apache/nuttx-ntfc.git@main; then
+                break
+              fi
+
+              if [ "$i" -eq 3 ]; then
+                echo "Failed to install NTFC after $i attempts"
+                exit 1
+              fi
+
               echo "Retry $i failed..."
               sleep 5
             done
diff --git a/boards/arm/imx6/sabre-6quad/configs/citest/config.yaml b/boards/arm/imx6/sabre-6quad/configs/citest/config.yaml
index 18fa16be62f0f..841c9da6ec743 100644
--- a/boards/arm/imx6/sabre-6quad/configs/citest/config.yaml
+++ b/boards/arm/imx6/sabre-6quad/configs/citest/config.yaml
@@ -7,6 +7,7 @@ product:
     core0:
       name: 'main'
       device: 'qemu'
+      line_buffered: true
       exec_path: 'qemu-system-arm'
       exec_args: '-semihosting -M sabrelite -m 1024 -smp 4 -nographic'
       conf_path: './.config'
diff --git a/boards/arm64/qemu/qemu-armv8a/configs/citest/config.yaml b/boards/arm64/qemu/qemu-armv8a/configs/citest/config.yaml
index 59ea992f725c8..bf08e8c312ef9 100644
--- a/boards/arm64/qemu/qemu-armv8a/configs/citest/config.yaml
+++ b/boards/arm64/qemu/qemu-armv8a/configs/citest/config.yaml
@@ -7,6 +7,7 @@ product:
     core0:
       name: 'main'
       device: 'qemu'
+      line_buffered: true
       exec_path: 'qemu-system-aarch64'
       exec_args: '-cpu cortex-a53 -nographic
                  -machine virt,virtualization=on,gic-version=3
diff --git a/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/config.yaml b/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/config.yaml
index ff79b3917b638..58a31819900ec 100644
--- a/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/config.yaml
+++ b/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/config.yaml
@@ -7,6 +7,7 @@ product:
     core0:
       name: 'main'
       device: 'qemu'
+      line_buffered: true
       exec_path: 'qemu-system-aarch64'
       exec_args: '-cpu cortex-a53 -nographic -smp 4
                  -machine virt,virtualization=on,gic-version=3
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/citest/config.yaml b/boards/risc-v/qemu-rv/rv-virt/configs/citest/config.yaml
index a934a55c82dd9..d1a8b52fdc2a2 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/citest/config.yaml
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/citest/config.yaml
@@ -7,6 +7,7 @@ product:
     core0:
       name: 'main'
       device: 'qemu'
+      line_buffered: true
       exec_path: 'qemu-system-riscv32'
       exec_args: '-semihosting -M virt,aclint=on -smp 1 -bios none -nographic
                   -drive index=0,id=userdata,if=none,format=raw,file=./fatfs.img
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/config.yaml b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/config.yaml
index 957b4fa7e1c13..56de118428344 100644
--- a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/config.yaml
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/config.yaml
@@ -7,6 +7,7 @@ product:
     core0:
       name: 'main'
       device: 'qemu'
+      line_buffered: true
       exec_path: 'qemu-system-riscv64'
       exec_args: '-semihosting -M virt,aclint=on -smp 1 -bios none -nographic'
       conf_path: './.config'
diff --git a/boards/sim/sim/sim/configs/citest/config.yaml b/boards/sim/sim/sim/configs/citest/config.yaml
index 84ee4c75599db..a9ef001de0202 100644
--- a/boards/sim/sim/sim/configs/citest/config.yaml
+++ b/boards/sim/sim/sim/configs/citest/config.yaml
@@ -8,5 +8,6 @@ product:
     core0:
       name: 'main'
       device: 'sim'
+      line_buffered: true
       conf_path: './.config'
       elf_path: './nuttx'