diff --git a/configure.py b/configure.py
index 7dd882ef..794c9f7c 100755
--- a/configure.py
+++ b/configure.py
@@ -144,8 +144,8 @@ if not config.non_matching:
 # Tool versions
 config.binutils_tag = "2.42-1"
 config.compilers_tag = "20240706"
-config.dtk_tag = "v0.9.5"
-config.objdiff_tag = "v2.0.0-beta.5"
+config.dtk_tag = "v1.0.0"
+config.objdiff_tag = "v2.2.0"
 config.sjiswrap_tag = "v1.1.1"
 config.wibo_tag = "0.6.11"
 
diff --git a/tools/project.py b/tools/project.py
index d085c3b4..55f91052 100644
--- a/tools/project.py
+++ b/tools/project.py
@@ -1243,6 +1243,7 @@ def generate_objdiff_config(
         src_exists = obj.src_path is not None and obj.src_path.exists()
         if src_exists:
             unit_config["base_path"] = obj.src_obj_path
+            unit_config["metadata"]["source_path"] = obj.src_path
 
         cflags = obj.options["cflags"]
         reverse_fn_order = False
@@ -1300,7 +1301,6 @@ def generate_objdiff_config(
             {
                 "complete": obj.completed,
                 "reverse_fn_order": reverse_fn_order,
-                "source_path": obj.src_path,
                 "progress_categories": progress_categories,
             }
         )