diff --git a/pkgs/bao/bao.nix b/pkgs/bao/bao.nix
index 076d6bf..69efc72 100644
--- a/pkgs/bao/bao.nix
+++ b/pkgs/bao/bao.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
     buildPhase = ''
         export ARCH=${plat_arch}
-        export CROSS_COMPILE=${plat_toolchain}
+        export CROSS_COMPILE=${plat_toolchain}-
         export DEMO=baremetal
         mkdir -p ./config
         cp -L ${demos}/demos/$DEMO/configs/${platform}.c \
diff --git a/pkgs/bao/bao_tf.nix b/pkgs/bao/bao_tf.nix
index 0019def..0c51604 100644
--- a/pkgs/bao/bao_tf.nix
+++ b/pkgs/bao/bao_tf.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
     buildPhase = ''
         export ARCH=${plat_arch}
-        export CROSS_COMPILE=${plat_toolchain}
+        export CROSS_COMPILE=${plat_toolchain}-
         export DEMO=baremetal
         mkdir -p ./config
         cp -L ${demos}/demos/$DEMO/configs/${platform}.c \
diff --git a/pkgs/guest/baremetal-local-tf.nix b/pkgs/guest/baremetal-local-tf.nix
index 7c6ac57..6e6c2a4 100644
--- a/pkgs/guest/baremetal-local-tf.nix
+++ b/pkgs/guest/baremetal-local-tf.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
     buildPhase = ''
         export ARCH=${plat_arch}
-        export CROSS_COMPILE=${plat_toolchain}
+        export CROSS_COMPILE=${plat_toolchain}-
         export TESTF_TESTS_DIR=$out/tests/src
         export TESTF_REPO_DIR=$out/tests/bao-tests
         chmod -R u+w $out/tests/bao-tests
diff --git a/pkgs/guest/baremetal-local.nix b/pkgs/guest/baremetal-local.nix
index 9961295..344d550 100644
--- a/pkgs/guest/baremetal-local.nix
+++ b/pkgs/guest/baremetal-local.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
     buildPhase = ''
         export ARCH=${plat_arch}
-        export CROSS_COMPILE=${plat_toolchain}
+        export CROSS_COMPILE=${plat_toolchain}-
         make -C $out PLATFORM=${platform}
     '';
 
diff --git a/pkgs/guest/baremetal-remote-tf.nix b/pkgs/guest/baremetal-remote-tf.nix
index 57b4494..5bb92ec 100644
--- a/pkgs/guest/baremetal-remote-tf.nix
+++ b/pkgs/guest/baremetal-remote-tf.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
     buildPhase = ''
         export ARCH=${plat_arch}
-        export CROSS_COMPILE=${plat_toolchain}
+        export CROSS_COMPILE=${plat_toolchain}-
         export TESTF_TESTS_DIR=$out/tests/src
         export TESTF_REPO_DIR=$out/tests/bao-tests
         chmod -R u+w $out/tests/bao-tests
diff --git a/pkgs/guest/baremetal-remote.nix b/pkgs/guest/baremetal-remote.nix
index 682fc37..1a600d4 100644
--- a/pkgs/guest/baremetal-remote.nix
+++ b/pkgs/guest/baremetal-remote.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
     buildPhase = ''
         export ARCH=${plat_arch}
-        export CROSS_COMPILE=${plat_toolchain}
+        export CROSS_COMPILE=${plat_toolchain}-
         make PLATFORM=${platform}
     '';
 
diff --git a/pkgs/platforms/platforms.nix b/pkgs/platforms/platforms.nix
index 228361e..901e994 100644
--- a/pkgs/platforms/platforms.nix
+++ b/pkgs/platforms/platforms.nix
@@ -23,16 +23,16 @@
   };
 
   platforms-toolchain = {
-    qemu-aarch64-virt = "aarch64-none-elf-";
-    zcu102 = "aarch64-none-elf-";
-    zcu104 = "aarch64-none-elf-";
-    imx8qm = "aarch64-none-elf-";
-    tx2 = "aarch64-none-elf-";
-    rpi4 = "aarch64-none-elf-";
-    fvp-a = "aarch64-none-elf-";
-    fvp-r = "aarch64-none-elf-";
-    fvp-a-aarch32 = "arm-none-eabi-";
-    fvp-r-aarch32 = "arm-none-eabi-";
-    qemu-riscv64-virt = "riscv64-unknown-elf-";
+    qemu-aarch64-virt = "aarch64-none-elf";
+    zcu102 = "aarch64-none-elf";
+    zcu104 = "aarch64-none-elf";
+    imx8qm = "aarch64-none-elf";
+    tx2 = "aarch64-none-elf";
+    rpi4 = "aarch64-none-elf";
+    fvp-a = "aarch64-none-elf";
+    fvp-r = "aarch64-none-elf";
+    fvp-a-aarch32 = "arm-none-eabi";
+    fvp-r-aarch32 = "arm-none-eabi";
+    qemu-riscv64-virt = "riscv64-unknown-elf";
   };
 }
\ No newline at end of file
diff --git a/pkgs/toolchains/aarch64-none-elf-11-3.nix b/pkgs/toolchains/aarch64-none-elf.nix
similarity index 100%
rename from pkgs/toolchains/aarch64-none-elf-11-3.nix
rename to pkgs/toolchains/aarch64-none-elf.nix
diff --git a/pkgs/toolchains/riscv64-unknown-elf-10.2.nix b/pkgs/toolchains/riscv64-unknown-elf.nix
similarity index 100%
rename from pkgs/toolchains/riscv64-unknown-elf-10.2.nix
rename to pkgs/toolchains/riscv64-unknown-elf.nix