diff --git a/default.nix b/default.nix
index 92bc96b47015e8cc4fa0f9241fb3b7489ab18b38..ba078e71401a2eb5b2c2ddd1577559c62d60f8ee 100644
--- a/default.nix
+++ b/default.nix
@@ -5,7 +5,7 @@ in
 with pkgs;
 let
   openocd = callPackage ./openocd.nix {};
-  rust = rustChannelOfTargets "nightly" null [ "thumbv7em-none-eabihf" ];
+  rust = rustChannelOfTargets "nightly" null [ "thumbv7em-none-eabi" ];
   rustPlatform = makeRustPlatform {
     rustc = rust;
     cargo = rust;
@@ -27,7 +27,7 @@ let
     version = "0.0.0";
     src = ./.;
     cargoSha256 = "10qv30p3kr570glnyn37b6r8pgx48zj0mr9qf84m4wk4sjp3wxsd";
-    buildInputs = [ pkgsCross.armhf-embedded.stdenv.cc glibc_multi ];
+    buildInputs = [ pkgsCross.arm-embedded.stdenv.cc glibc_multi ];
     prePatch = ''
       cp ${epic-stubs}/client.c l0dable/src/
     '';
@@ -40,7 +40,7 @@ let
     doCheck = false;
     installPhase = ''
       mkdir -p $out/lib
-      cp target/thumbv7em-none-eabihf/release/example $out/lib/example.elf
+      cp target/thumbv7em-none-eabi/release/example $out/lib/example.elf
     '';
   };
 in {
diff --git a/rkanoid/.cargo/config b/rkanoid/.cargo/config
index 6a24a28f52ae9167bf4b18f88dee579139958934..f8821054ad292324215bb53f18fedc1689fee47e 100644
--- a/rkanoid/.cargo/config
+++ b/rkanoid/.cargo/config
@@ -1,10 +1,9 @@
 [target.thumbv7em-none-eabihf]
 rustflags = [
-  "-C", "linker=arm-none-eabihf-gcc",
+  "-C", "linker=arm-none-eabi-gcc",
   "-C", "link-args=-Tl0dable.ld -n -pie -fPIC",
   "-C", "relocation-model=pic",
 ]
 
 [build]
-target = "thumbv7em-none-eabihf" # Cortex-M4F and Cortex-M7F (with FPU)
-
+target = "thumbv7em-none-eabi" # Cortex-M4F and Cortex-M7F (with FPU)
diff --git a/shell.nix b/shell.nix
index c5444d3b25c3798aaa66d379c4503374e8ac6630..bd460530d951872a9677299d2e56a35d2b615823 100644
--- a/shell.nix
+++ b/shell.nix
@@ -8,7 +8,7 @@ multiStdenv.mkDerivation {
   buildInputs = [
     gdb
     rust
-    pkgsCross.armhf-embedded.stdenv.cc
+    pkgsCross.arm-embedded.stdenv.cc
     openocd
   ];