diff --git a/projects/llvm-project/config b/projects/llvm-project/config
index 4174003426148a3da073098c583c5464331e62d7..dd7f212cb3628723a372bbe22f87523badbe7bf5 100644
--- a/projects/llvm-project/config
+++ b/projects/llvm-project/config
@@ -1,10 +1,10 @@
 # vim: filetype=yaml sw=2
-version: "[% c('var/llvm_major') %].1.8"
+version: "20.1.8"
 git_hash: 87f0227cb60147a26a1eeb4fb06e3b505e9c7261
 git_url: https://github.com/llvm/llvm-project
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
 
 var:
-  llvm_major: '20'
+  llvm_major: "[% c('version').split('\\.').0 %]"
 
 input_files:
diff --git a/tools/toolchain-updates/extract-firefox-versions-infos b/tools/toolchain-updates/extract-firefox-versions-infos
index 339f566ff8f94a88e170d8585283a49ae4d4f790..9993a6e8b16f92606dd454ae5f7e1abf8530d939 100755
--- a/tools/toolchain-updates/extract-firefox-versions-infos
+++ b/tools/toolchain-updates/extract-firefox-versions-infos
@@ -129,9 +129,16 @@ sub get_clang_info {
     }
 
     my $fetch = YAML::XS::LoadFile('taskcluster/kinds/fetch/toolchains.yml');
-    set_version_info("clang-$os", $fetch->{$clang_fetch}{fetch}{revision});
+    my ($clang_version) = $fetch->{$clang_fetch}{description} =~ m/^clang (.+) source code$/;
+    set_version_info("clang-${os}_version", $clang_version);
+    set_version_info("clang-${os}_revision", $fetch->{$clang_fetch}{fetch}{revision});
 
-    set_rbm_info("clang-$os", {
+    set_rbm_info("clang-${os}_version", {
+        project => 'llvm-project',
+        option  => 'version',
+        targets => [ $rbm_os_target{$os} ],
+      });
+    set_rbm_info("clang-${os}_revision", {
         project => 'llvm-project',
         option  => 'git_hash',
         targets => [ $rbm_os_target{$os} ],
@@ -142,17 +149,23 @@ sub get_clang_info {
 ## cbindgen
 sub get_cbindgen_info {
   my $fetch = YAML::XS::LoadFile('taskcluster/kinds/fetch/toolchains.yml');
-  my $revision;
+  my ($revision, $version);
   T: foreach my $t (keys %$fetch) {
     next unless $fetch->{$t}{'fetch-alias'};
     if ($fetch->{$t}{'fetch-alias'} eq 'cbindgen') {
       $revision = $fetch->{$t}{fetch}{revision};
+      ($version) = $t =~ m/^cbindgen-(.+)/;
       last T;
     }
   }
   return 0 unless $revision;
-  set_version_info('cbindgen', $revision);
-  set_rbm_info('cbindgen', {
+  set_version_info('cbindgen_version', $version);
+  set_rbm_info('cbindgen_version', {
+      project => 'cbindgen',
+      option  => 'version',
+    });
+  set_version_info('cbindgen_revision', $revision);
+  set_rbm_info('cbindgen_revision', {
       project => 'cbindgen',
       option  => 'git_hash',
     });