diff --git a/pkgs/guest/baremetal.nix b/pkgs/guest/baremetal.nix
index bb4ff74..a290fcd 100644
--- a/pkgs/guest/baremetal.nix
+++ b/pkgs/guest/baremetal.nix
@@ -10,10 +10,6 @@
 , setup-cfg
 , guest_name ? "baremetal"
 , baremetal_srcs_path ? " "
-, tests_path ? " "
-, list_tests ? " "
-, list_suites ? " "
-, log_level ? "2"
 }:
 
 stdenv.mkDerivation rec {
@@ -22,10 +18,6 @@ stdenv.mkDerivation rec {
     pname = guest_name;
     version = "1.0.0";
 
-    platform = setup-cfg.platform_name;
-    plat_arch = setup-cfg.arch;
-    plat_toolchain = setup-cfg.toolchain_name;
-
     guest_srcs = if baremetal_srcs_path == " " || baremetal_srcs_path == null then
         fetchFromGitHub {
             owner = "bao-project";
@@ -36,57 +28,24 @@ stdenv.mkDerivation rec {
         else
             baremetal_srcs_path;
 
-    baremetal_patch = if baremetal_srcs_path == " " || baremetal_srcs_path == null then
-            setup-cfg.baremetal_patch
-        else null;
 
     nativeBuildInputs = [ toolchain]; #build time dependencies
     buildInputs = [python3 python3Packages.numpy rsync];
 
-    unpackPhase = if tests_path == " " || tests_path == null then
-    ''
-        mkdir -p $out
-        rsync -r $guest_srcs/ $out
-    ''
-    else
-    ''
+    unpackPhase = ''
         mkdir -p $out
-        mkdir -p  $out/tests
-        mkdir -p $out/tests/src
-        mkdir -p $out/tests/bao-tests
-
-
-        rsync -r $guest_srcs/ $out
-        rsync -r ${setup-cfg.tests_srcs}/* $out/tests/src
-        rsync -r ${setup-cfg.bao-tests}/* $out/tests/bao-tests
-
-        chmod -R +rwx $out
-        cd $out/tests/bao-tests/framework
-        python3 codegen.py -dir $out/tests/src -o $out/tests/bao-tests/src/testf_entry.c
-
-        cd $out
-        patch -p1 < $baremetal_patch
-        
+        rsync -r $guest_srcs/ $out        
     '';
     
-    buildPhase = if tests_path == " " || tests_path == null then
-    ''
-        export ARCH=${plat_arch}
-        export CROSS_COMPILE=${plat_toolchain}-
-        make -C $out PLATFORM=${platform}
-    ''
-    else
-    ''
-        export ARCH=${plat_arch}
-        export CROSS_COMPILE=${plat_toolchain}-
-        export TESTF_TESTS_DIR=$out/tests/src
-        export TESTF_REPO_DIR=$out/tests/bao-tests
-        make -C $out PLATFORM=${platform} BAO_TEST=1 SUITES=${list_suites} TESTS=${list_tests} TESTF_LOG_LEVEL=${log_level}
+    buildPhase = ''
+        export ARCH=${setup-cfg.arch}
+        export CROSS_COMPILE=${setup-cfg.toolchain_name}-
+        make -C $out PLATFORM=${setup-cfg.platform_name}
     '';
 
     installPhase = ''
         mkdir -p $out/bin
-        cp $out/build/${platform}/baremetal.bin $out/bin/${guest_name}.bin
+        cp $out/build/${setup-cfg.platform_name}/baremetal.bin $out/bin/${guest_name}.bin
     '';
 
 }
diff --git a/pkgs/guest/tf/baremetal.nix b/pkgs/guest/tf/baremetal.nix
new file mode 100644
index 0000000..8fc3957
--- /dev/null
+++ b/pkgs/guest/tf/baremetal.nix
@@ -0,0 +1,73 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) Bao Project and Contributors. All rights reserved.
+
+{ stdenv
+, fetchFromGitHub
+, toolchain
+, python3
+, python3Packages
+, rsync
+, setup-cfg
+, guest_name ? "baremetal"
+, baremetal_srcs_path ? " "
+, tests_path ? " "
+, list_tests ? " "
+, list_suites ? " "
+, log_level ? "2"
+}:
+
+stdenv.mkDerivation rec {
+    # Derivation to build the baremetal-guest to run the bao test framework
+    # MUT: baremetal-guest
+    pname = guest_name;
+    version = "1.0.0";
+
+    guest_srcs = if baremetal_srcs_path == " " || baremetal_srcs_path == null then
+        fetchFromGitHub {
+            owner = "bao-project";
+            repo = "bao-baremetal-guest";
+            rev = "4010db4ba5f71bae72d4ceaf4efa3219812c6b12"; # branch demo
+            sha256 = "sha256-aiKraDtjv+n/cXtdYdNDKlbzOiBxYTDrMT8bdG9B9vU=";
+        }
+        else
+            baremetal_srcs_path;
+
+
+    nativeBuildInputs = [ toolchain]; #build time dependencies
+    buildInputs = [python3 python3Packages.numpy rsync];
+
+    unpackPhase = ''
+        mkdir -p $out
+        mkdir -p  $out/tests
+        mkdir -p $out/tests/src
+        mkdir -p $out/tests/bao-tests
+
+
+        rsync -r $guest_srcs/ $out
+        rsync -r ${setup-cfg.tests_srcs}/* $out/tests/src
+        rsync -r ${setup-cfg.bao-tests}/* $out/tests/bao-tests
+
+        chmod -R +rwx $out
+        cd $out/tests/bao-tests/framework
+        python3 codegen.py -dir $out/tests/src -o $out/tests/bao-tests/src/testf_entry.c
+        cd $out
+    '';
+
+    patches = [
+        "${setup-cfg.baremetal_patch}"
+    ];
+    
+    buildPhase = ''
+        export ARCH=${setup-cfg.arch}
+        export CROSS_COMPILE=${setup-cfg.toolchain_name}-
+        export TESTF_TESTS_DIR=$out/tests/src
+        export TESTF_REPO_DIR=$out/tests/bao-tests
+        make -C $out PLATFORM=${setup-cfg.platform_name} BAO_TEST=1 SUITES=${list_suites} TESTS=${list_tests} TESTF_LOG_LEVEL=${log_level}
+    '';
+
+    installPhase = ''
+        mkdir -p $out/bin
+        cp $out/build/${setup-cfg.platform_name}/baremetal.bin $out/bin/${guest_name}.bin
+    '';
+
+}