diff --git a/.bazelrc b/.bazelrc
index acd6f0c860..fee70be73a 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -50,9 +50,9 @@ build:eb-aarch64 --extra_toolchains=@ferrocene_aarch64_ebclfsa//:rust_ferrocene_
 build:eb-aarch64 --platforms=@score_bazel_platforms//:aarch64-linux-sdk_0.1.0-ebclfsa
 
 build:autosd-x86_64 --config=_common
-build:autosd-x86_64 --platforms=@score_bazel_platforms//:x86_64-linux
 build:autosd-x86_64 --force_pic
-build:autosd-x86_64 --extra_toolchains=@autosd_10_gcc_repo//:gcc_toolchain_linux_x86_64
+build:autosd-x86_64 --platforms=@score_bazel_platforms//:x86_64-linux-autosd10
+build:autosd-x86_64 --extra_toolchains=@score_autosd10_x86_64_toolchain//:x86_64-linux-autosd10
 build:autosd-x86_64 --extra_toolchains=@rules_rpm//toolchain:linux_x86_64
 
 # Ferrocene Rust coverage config
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index f3c9de92fc..c26f9d6d5f 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -8882,8 +8882,8 @@
     },
     "@@score_bazel_cpp_toolchains+//extensions:gcc.bzl%gcc": {
       "general": {
-        "bzlTransitiveDigest": "nZcsGzbA7gxL+rzoWSI0r/NeJ8NKwc1hZ2HpTmODLOk=",
-        "usagesDigest": "SxYNNSd2YcuSzXnFlyqDpFHwJHXcpuB6hLXsVwsx1mA=",
+        "bzlTransitiveDigest": "B1dX70i16FgdD9dV6dxjtnWG4LxzrZ2cRxQ4ptjUXbY=",
+        "usagesDigest": "4PFJlvfflJ+Z92BWv1b1foNxozs1imZXec5vv3PUkNk=",
         "recordedFileInputs": {},
         "recordedDirentsInputs": {},
         "envVariables": {},
@@ -8910,6 +8910,17 @@
               "strip_prefix": "fastdev-sdk-ubuntu-ebclfsa-ebcl-qemuarm64"
             }
           },
+          "score_autosd10_x86_64_toolchain_pkg": {
+            "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+            "attributes": {
+              "urls": [
+                "https://github.com/eclipse-score/inc_os_autosd/releases/download/continuous/autosd-toolchain-x86_64.tar.gz"
+              ],
+              "build_file": "@@score_bazel_cpp_toolchains+//packages/linux/x86_64/autosd/10.0:autosd.BUILD",
+              "sha256": "bb5324ec04895eb70b1fcb1787d25856b137962b0381d11f5b3406c37ee15984",
+              "strip_prefix": "sysroot"
+            }
+          },
           "score_qcc_aarch64_toolchain_pkg": {
             "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
             "attributes": {
@@ -9034,6 +9045,67 @@
               "use_base_constraints_only": false
             }
           },
+          "score_autosd10_x86_64_toolchain": {
+            "repoRuleId": "@@score_bazel_cpp_toolchains+//rules:gcc.bzl%gcc_toolchain",
+            "attributes": {
+              "extra_compile_flags": [],
+              "extra_c_compile_flags": [
+                "-nostdinc",
+                "-isystem",
+                "external/%{toolchain_pkg}%/usr/lib/gcc/x86_64-redhat-linux/14/include",
+                "-isystem",
+                "external/%{toolchain_pkg}%/usr/include"
+              ],
+              "extra_cxx_compile_flags": [
+                "-nostdinc++",
+                "-isystem",
+                "external/%{toolchain_pkg}%/usr/include/c++/14",
+                "-isystem",
+                "external/%{toolchain_pkg}%/usr/include/c++/14/x86_64-redhat-linux",
+                "-isystem",
+                "external/%{toolchain_pkg}%/usr/include/c++/14/backward",
+                "-nostdinc",
+                "-isystem",
+                "external/%{toolchain_pkg}%/usr/lib/gcc/x86_64-redhat-linux/14/include",
+                "-isystem",
+                "external/%{toolchain_pkg}%/usr/include"
+              ],
+              "extra_link_flags": [
+                "-B",
+                "external/%{toolchain_pkg}%/usr/bin",
+                "-L",
+                "external/%{toolchain_pkg}%/lib64",
+                "-L",
+                "external/%{toolchain_pkg}%/lib",
+                "-L",
+                "external/%{toolchain_pkg}%/usr/lib/gcc/x86_64-redhat-linux/14",
+                "-L",
+                "external/%{toolchain_pkg}%/usr/lib64",
+                "-L",
+                "external/%{toolchain_pkg}%/usr/lib",
+                "-lm",
+                "-ldl",
+                "-lrt",
+                "-lstdc++"
+              ],
+              "license_info_variable": "",
+              "license_info_value": "",
+              "license_path": "/opt/score_qnx/license/licenses",
+              "sdk_version": "",
+              "sdp_version": "",
+              "tc_compiler_library_search_paths": [],
+              "tc_cpu": "x86_64",
+              "tc_identifier": "",
+              "tc_os": "linux",
+              "tc_pkg_repo": "score_autosd10_x86_64_toolchain_pkg",
+              "tc_system_toolchain": false,
+              "tc_runtime_ecosystem": "autosd10",
+              "gcc_version": "",
+              "cc_toolchain_config": "@@score_bazel_cpp_toolchains+//templates/linux:cc_toolchain_config.bzl.template",
+              "cc_toolchain_flags": "@@score_bazel_cpp_toolchains+//templates/linux:cc_toolchain_flags.bzl.template",
+              "use_base_constraints_only": false
+            }
+          },
           "score_qcc_aarch64_toolchain": {
             "repoRuleId": "@@score_bazel_cpp_toolchains+//rules:gcc.bzl%gcc_toolchain",
             "attributes": {
diff --git a/bazel_common/score_gcc_toolchains.MODULE.bazel b/bazel_common/score_gcc_toolchains.MODULE.bazel
index 7ebb6b90b5..bd2045e80b 100644
--- a/bazel_common/score_gcc_toolchains.MODULE.bazel
+++ b/bazel_common/score_gcc_toolchains.MODULE.bazel
@@ -11,10 +11,10 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 
-bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.2")
+bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.5.0")
 git_override(
     module_name = "score_bazel_cpp_toolchains",
-    commit = "1a302d98b1f8f26864a38cb74761f891268a560f",
+    commit = "eba6b8c4b2d1d410a7f0cf8aae8b7938320bf6c8",
     remote = "https://github.com/eclipse-score/bazel_cpp_toolchains.git",
 )
 
@@ -35,6 +35,15 @@ gcc.toolchain(
     use_default_package = True,
 )
 
+## AutoSD10 Toolchain
+gcc.toolchain(
+    name = "score_autosd10_x86_64_toolchain",
+    runtime_ecosystem = "autosd10",
+    target_cpu = "x86_64",
+    target_os = "linux",
+    use_default_package = True,
+)
+
 bazel_dep(name = "os_autosd_toolchain", version = "0.0.1")
 
 # override with git
@@ -54,6 +63,7 @@ use_repo(rpm_toolchain, "rpm_toolchain")
 
 use_repo(
     gcc,
+    "score_autosd10_x86_64_toolchain",
     "score_ebclfsa_toolchain",
     "score_gcc_x86_64_toolchain",
 )