diff --git a/dev/Dockerfile b/dev/Dockerfile
index 1df09d12..6dd28448 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -49,9 +49,9 @@ RUN echo "source /home/dev/scripts/alias.sh" >> ~/.bashrc
 RUN ln -sf /usr/lib/linux-tools-*/* /usr/bin/
 
 # Install cross compiler
-RUN wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz | tar -xJv
+RUN wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi.tar.xz | tar -xJv
 
-ENV PATH $PATH:/home/dev/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi/bin
+ENV PATH $PATH:/home/dev/arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi/bin
 
 # build and install customized openocd
 RUN apt-get install -y libtool libusb-1.0.0-dev
diff --git a/ner_environment/build_system/build_system.py b/ner_environment/build_system/build_system.py
index 80df52c0..65d64b95 100644
--- a/ner_environment/build_system/build_system.py
+++ b/ner_environment/build_system/build_system.py
@@ -73,8 +73,8 @@ def build(profile: str = typer.Option(None, "--profile", "-p", callback=unsuppor
         else:
             run_command_docker(f"make -j{os.cpu_count()}", stream_output=True)
 
-    if not clean:
-        fix_compile_commands()
+    # if not clean:
+    #     fix_compile_commands()
 
 # ==============================================================================
 # Clang command
@@ -353,9 +353,9 @@ def fix_compile_commands():
     os_type = platform.system()
     toolchain_name = ""
     if os_type == "Linux":
-        toolchain_name = "arm-gnu-toolchain-14.3.rel1-x86_64-arm-none-eabi"
+        toolchain_name = "arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi"
     else:
-        toolchain_name = "arm-gnu-toolchain-14.3.rel1-darwin-arm64-arm-none-eabi"
+        toolchain_name = "arm-gnu-toolchain-15.2.rel1-darwin-arm64-arm-none-eabi"
 
     toolchain_name_ext = toolchain_name + ".tar.xz"