diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3e76149ad052f..6974277d1c664 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -184,42 +184,26 @@ jobs:
       - name: Export NuttX Repo SHA
         run: echo "nuttx_sha=`git -C sources/nuttx rev-parse HEAD`" >> $GITHUB_ENV
 
-      - name: Install NTFC
+      - name: Run builds
         uses: ./sources/nuttx/.github/actions/ci-container
         env:
           BLOBDIR: /tools/blobs
         with:
           run: |
-            # install python venv
-            apt-get update
-            apt-get install -y python3 python3-dev python3-venv
-
-            # get NTFC sources
-            git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-ntfc
+            pip install ntfc==0.0.1
+            mkdir /github/workspace/nuttx-ntfc
+            mkdir /github/workspace/nuttx-ntfc/external
             cd /github/workspace/nuttx-ntfc
-
-            # install NTFC with venv
-            python3 -m venv /github/workspace/nuttx-ntfc/venv
-            source /github/workspace/nuttx-ntfc/venv/bin/activate
-            pip3 install .
-            deactivate
-
             # get NTFC test cases
             cd external
             git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-testing
 
-      - name: Run builds
-        uses: ./sources/nuttx/.github/actions/ci-container
-        env:
-          BLOBDIR: /tools/blobs
-        with:
-          run: |
             echo "::add-matcher::sources/nuttx/.github/gcc.json"
             export ARTIFACTDIR=`pwd`/buildartifacts
             export NTFCDIR=/github/workspace/nuttx-ntfc
             git config --global --add safe.directory /github/workspace/sources/nuttx
             git config --global --add safe.directory /github/workspace/sources/apps
-            cd sources/nuttx/tools/ci
+            cd /github/workspace/sources/nuttx/tools/ci
             if [ "X${{matrix.boards}}" = "Xcodechecker" ]; then
                 ./cibuild.sh -c -A -N -R --codechecker testlist/${{matrix.boards}}.dat
             else
diff --git a/boards/arm/imx6/sabre-6quad/configs/citest/run.sh b/boards/arm/imx6/sabre-6quad/configs/citest/run.sh
index fd7e627792f5b..e160ff97766b7 100755
--- a/boards/arm/imx6/sabre-6quad/configs/citest/run.sh
+++ b/boards/arm/imx6/sabre-6quad/configs/citest/run.sh
@@ -28,21 +28,15 @@ olddir=$(pwd)
 nuttdir=${CURRENTCONFDIR}/../../../../../../
 cd ${nuttdir}
 
-# enable venv
-source ${NTFCDIR}/venv/bin/activate
-
 # run NTFC
 confpath=${CURRENTCONFDIR}/config.yaml
 jsonconf=${CURRENTCONFDIR}/session.json
 testpath=${NTFCDIR}/external/nuttx-testing
-python3 -m ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
+ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
 
 ret="$?"
 echo $ret
 
-# disable venv
-deactivate
-
 # export test results
 artifacts=${ARTIFACTCONFDIR}/ntfc
 mkdir -p ${artifacts}
diff --git a/boards/arm64/qemu/qemu-armv8a/configs/citest/run.sh b/boards/arm64/qemu/qemu-armv8a/configs/citest/run.sh
index 95b1a49d4a658..4ff4d6ac14579 100755
--- a/boards/arm64/qemu/qemu-armv8a/configs/citest/run.sh
+++ b/boards/arm64/qemu/qemu-armv8a/configs/citest/run.sh
@@ -28,21 +28,15 @@ olddir=$(pwd)
 nuttdir=${CURRENTCONFDIR}/../../../../../../
 cd ${nuttdir}
 
-# enable venv
-source ${NTFCDIR}/venv/bin/activate
-
 # run NTFC
 confpath=${CURRENTCONFDIR}/config.yaml
 jsonconf=${CURRENTCONFDIR}/session.json
 testpath=${NTFCDIR}/external/nuttx-testing
-python3 -m ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
+ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
 
 ret="$?"
 echo $ret
 
-# disable venv
-deactivate
-
 # export test results
 artifacts=${ARTIFACTCONFDIR}/ntfc
 mkdir -p ${artifacts}
diff --git a/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/run.sh b/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/run.sh
index e417134520ce2..31f24b69d2158 100755
--- a/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/run.sh
+++ b/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/run.sh
@@ -28,21 +28,15 @@ olddir=$(pwd)
 nuttdir=${CURRENTCONFDIR}/../../../../../../
 cd ${nuttdir}
 
-# enable venv
-source ${NTFCDIR}/venv/bin/activate
-
 # run NTFC
 confpath=${CURRENTCONFDIR}/config.yaml
 jsonconf=${CURRENTCONFDIR}/session.json
 testpath=${NTFCDIR}/external/nuttx-testing
-python3 -m ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
+ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
 
 ret="$?"
 echo $ret
 
-# disable venv
-deactivate
-
 # export test results
 artifacts=${ARTIFACTCONFDIR}/ntfc
 mkdir -p ${artifacts}
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/citest/run.sh b/boards/risc-v/qemu-rv/rv-virt/configs/citest/run.sh
index c283fbd339aa5..5245d33e497c2 100755
--- a/boards/risc-v/qemu-rv/rv-virt/configs/citest/run.sh
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/citest/run.sh
@@ -33,21 +33,15 @@ dd if=/dev/zero of=fatfs.img bs=512 count=128K
 mkfs.fat fatfs.img
 chmod 777 ./fatfs.img
 
-# enable venv
-source ${NTFCDIR}/venv/bin/activate
-
 # run NTFC
 confpath=${CURRENTCONFDIR}/config.yaml
 jsonconf=${CURRENTCONFDIR}/session.json
 testpath=${NTFCDIR}/external/nuttx-testing
-python3 -m ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
+ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
 
 ret="$?"
 echo $ret
 
-# disable venv
-deactivate
-
 # export test results
 artifacts=${ARTIFACTCONFDIR}/ntfc
 mkdir -p ${artifacts}
diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/run.sh b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/run.sh
index 7f6a3e9752460..d3f04ee0438e6 100755
--- a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/run.sh
+++ b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/run.sh
@@ -35,7 +35,7 @@ source ${NTFCDIR}/venv/bin/activate
 confpath=${CURRENTCONFDIR}/config.yaml
 jsonconf=${CURRENTCONFDIR}/session.json
 testpath=${NTFCDIR}/external/nuttx-testing
-python3 -m ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
+ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
 
 ret="$?"
 echo $ret
diff --git a/boards/sim/sim/sim/configs/citest/run.sh b/boards/sim/sim/sim/configs/citest/run.sh
index 3cc18b7cfefae..ebeb6662e82d5 100755
--- a/boards/sim/sim/sim/configs/citest/run.sh
+++ b/boards/sim/sim/sim/configs/citest/run.sh
@@ -28,21 +28,15 @@ olddir=$(pwd)
 nuttdir=${CURRENTCONFDIR}/../../../../../../
 cd ${nuttdir}
 
-# enable venv
-source ${NTFCDIR}/venv/bin/activate
-
 # run NTFC
 confpath=${CURRENTCONFDIR}/config.yaml
 jsonconf=${CURRENTCONFDIR}/session.json
 testpath=${NTFCDIR}/external/nuttx-testing
-python3 -m ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
+ntfc test --testpath=${testpath} --confpath=${confpath} --jsonconf=${jsonconf}
 
 ret="$?"
 echo $ret
 
-# disable venv
-deactivate
-
 # export test results
 artifacts=${ARTIFACTCONFDIR}/ntfc
 mkdir -p ${artifacts}