diff --git a/.bazelrc b/.bazelrc
index 502b4ce7..dc9524dd 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,8 +1,3 @@
-build --java_language_version=17
-build --tool_java_language_version=17
-build --java_runtime_version=remotejdk_17
-build --tool_java_runtime_version=remotejdk_17
-
 build --@score-baselibs//score/json:base_library=nlohmann
 build --@score-baselibs//score/mw/log/flags:KRemote_Logging=False
 
diff --git a/.bazelversion b/.bazelversion
index 2bf50aaf..6da4de57 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-8.3.0
+8.4.1
diff --git a/BUILD b/BUILD
index 07419c37..87721028 100644
--- a/BUILD
+++ b/BUILD
@@ -11,12 +11,8 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 
-load("@score_cli_helper//:cli_helper.bzl", "cli_helper")
-load("@score_cr_checker//:cr_checker.bzl", "copyright_checker")
-load("@score_dash_license_checker//:dash.bzl", "dash_license_checker")
 load("@score_docs_as_code//:docs.bzl", "docs")
-load("@score_format_checker//:macros.bzl", "use_format_targets")
-load("@score_starpls_lsp//:starpls.bzl", "setup_starpls")
+load("@score_tooling//:defs.bzl", "cli_helper", "copyright_checker", "dash_license_checker", "setup_starpls", "use_format_targets")
 load("//:project_config.bzl", "PROJECT_CONFIG")
 
 # Creates all documentation targets:
@@ -41,8 +37,8 @@ copyright_checker(
         "//:BUILD",
         "//:MODULE.bazel",
     ],
-    config = "@score_cr_checker//resources:config",
-    template = "@score_cr_checker//resources:templates",
+    config = "@score_tooling//cr_checker/resources:config",
+    template = "@score_tooling//cr_checker/resources:templates",
     visibility = ["//visibility:public"],
 )
 
diff --git a/MODULE.bazel b/MODULE.bazel
index 1addd463..2d6ede0e 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -30,61 +30,48 @@ python.toolchain(
 use_repo(python)
 
 # rust
-bazel_dep(name = "rules_rust", version = "0.56.0")
+bazel_dep(name = "rules_rust", version = "0.65.0")
 
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(
-    edition = "2021",
-    versions = ["1.85.0"],
+    edition = "2024",
+    versions = ["1.90.0"],
 )
 
 # LLVM Toolchains Rules - host configuration
-bazel_dep(name = "rules_cc", version = "0.1.1")
-bazel_dep(name = "toolchains_llvm", version = "1.2.0")
+bazel_dep(name = "rules_cc", version = "0.2.8")
+bazel_dep(name = "toolchains_llvm", version = "1.5.0")
 
 llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
 llvm.toolchain(
+    compile_flags = {"": [
+        "-Wno-error=deprecated-declarations",
+        "-Wno-error=deprecated-literal-operator",
+    ]},
     cxx_standard = {"": "c++17"},
-    llvm_version = "19.1.0",
+    llvm_version = "21.1.0",
 )
 use_repo(llvm, "llvm_toolchain")
-use_repo(llvm, "llvm_toolchain_llvm")
 
 register_toolchains("@llvm_toolchain//:all")
 
 ## Bazel registry
 # Module dependencies
-bazel_dep(name = "googletest", version = "1.15.0")
+bazel_dep(name = "googletest", version = "1.17.0")
 bazel_dep(name = "google_benchmark", version = "1.9.4")
 
 ## S-CORE bazel registry
-# Checker rule for CopyRight checks/fixs
-bazel_dep(name = "score_cr_checker", version = "0.3.1")
-
-# Starlark language server
-bazel_dep(name = "score_starpls_lsp", version = "0.1.0")
-
-#Dash license checker
-bazel_dep(name = "score_dash_license_checker", version = "0.1.2")
-
-# Format checker
-bazel_dep(name = "score_format_checker", version = "0.1.1")
-bazel_dep(name = "aspect_rules_lint", version = "1.4.4")
+bazel_dep(name = "score_tooling", version = "1.0.2")
+bazel_dep(name = "aspect_rules_lint", version = "1.7.0")
 bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
 
 # docs-as-code
-bazel_dep(name = "score_docs_as_code", version = "1.0.1")
-
-# Provides, pytest & venv
-bazel_dep(name = "score_python_basics", version = "0.3.4")
-bazel_dep(name = "score_platform", version = "0.3.0")
-bazel_dep(name = "score_process", version = "1.1.0")
-
-# cli helper
-bazel_dep(name = "score_cli_helper", version = "0.1.2")
+bazel_dep(name = "score_docs_as_code", version = "1.3.0")
 
 # Module deps
 bazel_dep(name = "score-baselibs", version = "0.0.0")
+bazel_dep(name = "score_platform", version = "0.3.0")
+bazel_dep(name = "score_process", version = "1.2.0")
 
 ## additional settings / config
 crate = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
@@ -106,25 +93,26 @@ use_repo(crate, "score_persistency_crates")
 bazel_dep(name = "testing-utils")
 git_override(
     module_name = "testing-utils",
-    commit = "a847c7464cfa47e000141631d1223b92560d2e58",  # tag v0.2.0
+    commit = "4f9f2544a7b34288d36be120fa1acf4b57859600",  # tag v0.2.3
     remote = "https://github.com/qorix-group/testing_tools.git",
 )
 
 git_override(
-    module_name = "score_docs_as_code",
-    commit = "13ba715a95cfe85158b60d7f4748ba8e28895d8c",
-    remote = "https://github.com/eclipse-score/docs-as-code.git",
+    module_name = "score-baselibs",
+    commit = "253571652d8f8e3df6e073ad17cb0cbb688278ee",
+    remote = "https://github.com/eclipse-score/baselibs.git",
 )
 
-#bazel_dep on module 'rules_boost' has no version -> override needed
-archive_override(
-    module_name = "rules_boost",
-    strip_prefix = "rules_boost-master",
-    urls = ["https://github.com/nelhage/rules_boost/archive/refs/heads/master.tar.gz"],
+# ToDo: needed to get //:docs running until 0.4.0 is officially released
+git_override(
+    module_name = "score_platform",
+    commit = "64eb8acf8436c60f1a6daaf6bc67763797792838",
+    remote = "https://github.com/eclipse-score/score.git",
 )
 
+# ToDo: workaround until https://github.com/eclipse-score/baselibs/issues/20 is clarified
 git_override(
-    module_name = "score-baselibs",
-    commit = "46923f5c4f302bd9feae0261588687aaf32e3c5c",
-    remote = "https://github.com/eclipse-score/baselibs.git",
+    module_name = "score_tooling",
+    commit = "b8f58954485d8a19856a3aacdc69a6cbdd12972d",
+    remote = "https://github.com/eclipse-score/tooling.git",
 )
diff --git a/src/rust/rust_kvs/src/kvs_value.rs b/src/rust/rust_kvs/src/kvs_value.rs
index 72ae056b..3b0b7499 100644
--- a/src/rust/rust_kvs/src/kvs_value.rs
+++ b/src/rust/rust_kvs/src/kvs_value.rs
@@ -90,7 +90,7 @@ macro_rules! impl_tryfrom_kvs_value_to_t {
         impl std::convert::TryFrom<&KvsValue> for $to {
             type Error = String;
             fn try_from(value: &KvsValue) -> Result<Self, Self::Error> {
-                if let KvsValue::$variant(ref n) = value {
+                if let KvsValue::$variant(n) = value {
                     Ok(n.clone())
                 } else {
                     Err(format!("KvsValue is not a {}", stringify!($to)))