diff --git a/.bazelversion b/.bazelversion
index ac14c3d..024b066 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-5.1.1
+6.2.1
diff --git a/WORKSPACE b/WORKSPACE
index cb11705..e805e27 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -130,7 +130,7 @@
 
 # Scala setup
 load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
-scala_config(scala_version = "2.13.6")
+scala_config(scala_version = "2.13.11")
 load("@io_bazel_rules_scala//scala:scala.bzl", "rules_scala_setup", "rules_scala_toolchain_deps_repositories")
 rules_scala_setup()
 rules_scala_toolchain_deps_repositories(fetch_sources = True)
diff --git a/hw/dv/tools/dvsim/sim.mk b/hw/dv/tools/dvsim/sim.mk
index 0325477..c888717 100644
--- a/hw/dv/tools/dvsim/sim.mk
+++ b/hw/dv/tools/dvsim/sim.mk
@@ -130,7 +130,10 @@
 				$${bazel_cquery} \
 				--ui_event_filters=-info \
 				--noshow_progress \
-				--output=starlark); do \
+				--output=starlark \
+				`# Bazel 6 cquery outputs repository targets in canonical format (@//blabla) whereas bazel 5 does not, ` \
+				`# so we use a custom starlark printer to remove in leading @ when needed.` \
+				--starlark:expr='str(target.label)[1:] if str(target.label).startswith("@//") else target.label'); do \
 				if [[ $$dep != //hw* ]] && [[ $$dep != //util* ]] && [[ $$dep != //sw/host* ]] && [[ $$dep != @lowrisc_opentitan//* ]]; then \
 					for artifact in $$($${bazel_cmd} cquery $${dep} \
 						--ui_event_filters=-info \
diff --git a/hw/top_matcha/util/vivado_hook_write_bitstream_pre.tcl b/hw/top_matcha/util/vivado_hook_write_bitstream_pre.tcl
index 054d3ec..6938617 100644
--- a/hw/top_matcha/util/vivado_hook_write_bitstream_pre.tcl
+++ b/hw/top_matcha/util/vivado_hook_write_bitstream_pre.tcl
@@ -19,10 +19,14 @@
 set slack_ns [get_property SLACK [get_timing_paths -delay_type min_max]]
 send_msg "Designcheck 1-2" INFO "Slack is ${slack_ns} ns."
 
-if [expr {$slack_ns < 0}] {
-  send_msg "Designcheck 1-3" ERROR "Timing failed. Slack is ${slack_ns} ns."
+if {
+    [info exists ::env(VIVADO_FAIL_ON_TIMING)]
+    && $::env(VIVADO_FAIL_ON_TIMING) != 0
+} then {
+    if [expr {$slack_ns < 0}] {
+        send_msg "Designcheck 1-3" ERROR "Timing failed. Slack is ${slack_ns} ns."
+    }
 }
-
 # Enable bitstream identification via USR_ACCESS register.
 set_property BITSTREAM.CONFIG.USR_ACCESS TIMESTAMP [current_design]
 
diff --git a/util/prep-bazel-airgapped-build.sh b/util/prep-bazel-airgapped-build.sh
index fb8fb08..75a470f 100755
--- a/util/prep-bazel-airgapped-build.sh
+++ b/util/prep-bazel-airgapped-build.sh
@@ -46,7 +46,7 @@
 
 : "${BAZEL_VERSION:=$(cat ${REPO_TOP}/.bazelversion)}"
 
-: "${BAZEL_AIRGAPPED_DIR:=bazel-airgapped_otf243e680}"
+: "${BAZEL_AIRGAPPED_DIR:=bazel-airgapped_ot9d059106}"
 : "${BAZEL_DISTDIR:=bazel-distdir}"
 : "${BAZEL_CACHEDIR:=bazel-cache}"
 : "${BAZEL_PYTHON_WHEEL_REPO:=ot_python_wheels}"