2 files changed, 27 insertions, 5 deletions

diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 7fe0316bce..a7bfb64cd5 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -33,15 +33,18 @@
         "5424051723": "http://devtools-registry.s3.yandex.net/5424051723",
         "5453803895": "http://devtools-registry.s3.yandex.net/5453803895",
         "5451200437": "http://devtools-registry.s3.yandex.net/5451200437",
-        "4908351129": "http://devtools-registry.s3.yandex.net/4908351129",
         "5450199978": "http://devtools-registry.s3.yandex.net/5450199978",
+        "5458408674": "http://devtools-registry.s3.yandex.net/5458408674",
         "1966560555": "http://devtools-registry.s3.yandex.net/1966560555",
         "309054781": "http://devtools-registry.s3.yandex.net/309054781",
         "5298918458": "http://devtools-registry.s3.yandex.net/5298918458",
         "5298901591": "http://devtools-registry.s3.yandex.net/5298901591",
         "360916612": "http://devtools-registry.s3.yandex.net/360916612",
+        "4312044253": "http://devtools-registry.s3.yandex.net/4312044253",
+        "4312093363": "http://devtools-registry.s3.yandex.net/4312093363",
         "4312064267": "http://devtools-registry.s3.yandex.net/4312064267",
         "4312063561": "http://devtools-registry.s3.yandex.net/4312063561",
+        "4312072792": "http://devtools-registry.s3.yandex.net/4312072792",
         "2062930743": "http://devtools-registry.s3.yandex.net/2062930743",
         "2842390994": "http://devtools-registry.s3.yandex.net/2842390994",
         "5310288728": "http://devtools-registry.s3.yandex.net/5310288728",
@@ -71,14 +74,22 @@
         "3968797636": "http://devtools-registry.s3.yandex.net/3968797636",
         "5437210524": "http://devtools-registry.s3.yandex.net/5437210524",
         "5437183640": "http://devtools-registry.s3.yandex.net/5437183640",
+        "4307900052": "http://devtools-registry.s3.yandex.net/4307900052",
+        "4307900057": "http://devtools-registry.s3.yandex.net/4307900057",
         "4307890075": "http://devtools-registry.s3.yandex.net/4307890075",
         "4307901240": "http://devtools-registry.s3.yandex.net/4307901240",
+        "4307903123": "http://devtools-registry.s3.yandex.net/4307903123",
         "3833498694": "http://devtools-registry.s3.yandex.net/3833498694",
-        "4778824667": "http://devtools-registry.s3.yandex.net/4778824667",
+        "2088833948": "http://devtools-registry.s3.yandex.net/2088833948",
         "3167009386": "http://devtools-registry.s3.yandex.net/3167009386",
         "3050798466": "http://devtools-registry.s3.yandex.net/3050798466",
         "3064614561": "http://devtools-registry.s3.yandex.net/3064614561",
         "3166999959": "http://devtools-registry.s3.yandex.net/3166999959",
+        "2000736487": "http://devtools-registry.s3.yandex.net/2000736487",
+        "2000736769": "http://devtools-registry.s3.yandex.net/2000736769",
+        "2000736617": "http://devtools-registry.s3.yandex.net/2000736617",
+        "1093314933": "http://devtools-registry.s3.yandex.net/1093314933",
+        "2264052281": "http://devtools-registry.s3.yandex.net/2264052281",
         "5054517618": "http://devtools-registry.s3.yandex.net/5054517618",
         "5054512910": "http://devtools-registry.s3.yandex.net/5054512910",
         "5054518131": "http://devtools-registry.s3.yandex.net/5054518131",
@@ -126,15 +137,18 @@
         "5424051723": "OTHER_RESOURCE-none-1.21.3-y_go1.21.3.windows-amd64.tar.gz",
         "5453803895": "OTHER_RESOURCE-none-none-lld.tgz",
         "5451200437": "OTHER_RESOURCE-none-none-lld.tgz",
-        "4908351129": "OTHER_RESOURCE-none-none-lld.tgz",
         "5450199978": "OTHER_RESOURCE-none-none-lld.tgz",
+        "5458408674": "OTHER_RESOURCE-none-none-lld.tgz",
         "1966560555": "Ubuntu 14 x86-64 native SDK (patched, v3)",
         "309054781": "Ubuntu 16 x86-64 -> Ubuntu 16 aarch64 cross SDK",
         "5298918458": "bin-gdb-reloc-ya-linux-aarch64-62901b3b39a8b08c2d39a3bf08a1fc3a6d76eb78",
         "5298901591": "bin-gdb-reloc-ya-linux-x86_64-62901b3b39a8b08c2d39a3bf08a1fc3a6d76eb78",
         "360916612": "binutils 2.26 for linux_ubuntu_10.04_lucid",
+        "4312044253": "black_linter for darwin",
+        "4312093363": "black_linter for darwin-arm64",
         "4312064267": "black_linter for linux",
         "4312063561": "black_linter for linux-aarch64",
+        "4312072792": "black_linter.exe for win32-clang-cl",
         "2062930743": "contrib/libs/clang11/pkg-windows-x86_64.json",
         "2842390994": "devtools jacoco agent 0.8.7 with shaded asm",
         "5310288728": "devtools jstyle runner 10.12.4",
@@ -164,14 +178,22 @@
         "3968797636": "devtools/ya/test/programs/flake8/py3/flake8 for win32",
         "5437210524": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
         "5437183640": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
+        "4307900052": "flake8_linter for darwin",
+        "4307900057": "flake8_linter for darwin-arm64",
         "4307890075": "flake8_linter for linux",
         "4307901240": "flake8_linter for linux-aarch64",
+        "4307903123": "flake8_linter.exe for win32-clang-cl",
         "3833498694": "gdb 11.2 for osx_10.15_catalina",
-        "4778824667": "lld for linux aarch64",
+        "2088833948": "macOS 11.1 Big Sur SDK / Xcode 12.4 (12D4e)",
         "3167009386": "openjdk 11.0.15 vanilla for darwin",
         "3050798466": "openjdk 11.0.15 vanilla for darwin-arm64",
         "3064614561": "openjdk 11.0.15 vanilla for linux",
         "3166999959": "openjdk 11.0.15 vanilla for windows",
+        "2000736487": "tools/go_fake_xcrun/xcrun for darwin",
+        "2000736769": "tools/go_fake_xcrun/xcrun for linux",
+        "2000736617": "tools/go_fake_xcrun/xcrun for win32",
+        "1093314933": "wine 4.0 for linux_ubuntu_10.04_lucid",
+        "2264052281": "wine 4.0 for linux_ubuntu_16.04_xenial (32bit)",
         "5054517618": "ya-tc for darwin",
         "5054512910": "ya-tc for darwin-arm64",
         "5054518131": "ya-tc for linux",
diff --git a/build/platform/lld/lld16.json b/build/platform/lld/lld16.json
index 260c9ae28b..8cbcb20b7d 100644
--- a/build/platform/lld/lld16.json
+++ b/build/platform/lld/lld16.json
@@ -8,7 +8,7 @@
             "uri": "sbr:5453803895"
         },
         "linux-aarch64": {
-            "uri": "sbr:4778824667"
+            "uri": "sbr:5458408674"
         },
         "linux-x86_64": {
             "uri": "sbr:5450199978"