diff --git a/pkgs/guest/baremetal.nix b/pkgs/guest/baremetal.nix
index fb48ea8..cd4ebeb 100644
--- a/pkgs/guest/baremetal.nix
+++ b/pkgs/guest/baremetal.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     buildPhase = ''
         export ARCH=${setup-cfg.arch}
         export CROSS_COMPILE=${setup-cfg.toolchain_name}-
-        if [ ARCH == "aarch64" ]; then
+        if [ "$ARCH" == "aarch64" ]; then
         make -C $out PLATFORM=${setup-cfg.platform_name} \
                 ${setup-cfg.irq_flags}
         else
diff --git a/pkgs/guest/tf/baremetal.nix b/pkgs/guest/tf/baremetal.nix
index 4acd934..c13c9cc 100644
--- a/pkgs/guest/tf/baremetal.nix
+++ b/pkgs/guest/tf/baremetal.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
         export CROSS_COMPILE=${setup-cfg.toolchain_name}-
         export TESTF_TESTS_DIR=$out/tests/src
         export TESTF_REPO_DIR=$out/tests/bao-tests
-        if [ ARCH == "aarch64" ]; then
+         if [ "ARCH" == "aarch64" ]; then
             make -C $out PLATFORM=${setup-cfg.platform_name} \
                 BAO_TEST=1 SUITES=${list_suites} TESTS=${list_tests} \
                 TESTF_LOG_LEVEL=${log_level} \