diff --git a/build_tools/BUILD b/build_tools/BUILD
index 5cb4d467..4983223a 100644
--- a/build_tools/BUILD
+++ b/build_tools/BUILD
@@ -281,9 +281,12 @@ cc_binary(
     srcs = ["exit0.c"],
 )
 
-cc_test(
+# `pass` used to be a `cc_test` but starting with Bazel 5.0.0 we ran into conflicting actions issues due
+# to this test target being added as a dependency to other test and non-test targets.
+# See this issue for more info: see https://github.com/bazelbuild/bazel/issues/14294.
+sh_test(
     name = "pass",
-    srcs = ["exit0.c"],
+    srcs = ["exit0.sh"],
 )
 
 dbx_sh_binary(
diff --git a/build_tools/BUILD.in b/build_tools/BUILD.in
index 4731abbd..27c84a70 100644
--- a/build_tools/BUILD.in
+++ b/build_tools/BUILD.in
@@ -209,9 +209,12 @@ cc_binary(
     srcs = ["exit0.c"],
 )
 
-cc_test(
+# `pass` used to be a `cc_test` but starting with Bazel 5.0.0 we ran into conflicting actions issues due
+# to this test target being added as a dependency to other test and non-test targets.
+# See this issue for more info: see https://github.com/bazelbuild/bazel/issues/14294.
+sh_test(
     name = "pass",
-    srcs = ["exit0.c"],
+    srcs = ["exit0.sh"],
 )
 
 dbx_sh_binary(
diff --git a/build_tools/bazel/external_workspace.bzl b/build_tools/bazel/external_workspace.bzl
index 2830aff9..d5988434 100644
--- a/build_tools/bazel/external_workspace.bzl
+++ b/build_tools/bazel/external_workspace.bzl
@@ -7,7 +7,7 @@ def filename_from_label(label):
 
 DEFAULT_EXTERNAL_URLS = {
     "abseil_py": ["https://github.com/abseil/abseil-py/archive/pypi-v0.7.1.tar.gz"],
-    "bazel_skylib": ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz"],
+    "bazel_skylib": ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.0/bazel-skylib-1.2.0.tar.gz"],
     "com_github_plougher_squashfs_tools": ["https://github.com/plougher/squashfs-tools/archive/4.4.tar.gz"],
     "cpython_38": ["https://www.python.org/ftp/python/3.8.1/Python-3.8.1.tar.xz"],
     "cpython_39": ["https://www.python.org/ftp/python/3.9.9/Python-3.9.9.tar.xz"],
@@ -82,7 +82,7 @@ def drte_deps(urls = DEFAULT_EXTERNAL_URLS):
     http_archive(
         name = "bazel_skylib",
         urls = urls["bazel_skylib"],
-        sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44",
+        sha256 = "af87959afe497dc8dfd4c6cb66e1279cb98ccc84284619ebfec27d9c09a903de",
     )
 
     pypi_core_deps(urls)