diff --git a/WORKSPACE b/WORKSPACE
index d2fb708402f5..eccd541f9b34 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -671,7 +671,7 @@ scala_repositories(
 
 load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
 
-scala_register_toolchains()
+register_toolchains("//bazel_tools/scala:toolchain")
 
 load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
 
diff --git a/bazel_tools/scala/BUILD.bazel b/bazel_tools/scala/BUILD.bazel
new file mode 100644
index 000000000000..36af813a6bf6
--- /dev/null
+++ b/bazel_tools/scala/BUILD.bazel
@@ -0,0 +1,17 @@
+# Copyright (c) 2021 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+load("@io_bazel_rules_scala//scala:scala_toolchain.bzl", "scala_toolchain")
+
+scala_toolchain(
+    name = "toolchain_impl",
+    enable_stats_file = False,
+    visibility = ["//visibility:public"],
+)
+
+toolchain(
+    name = "toolchain",
+    toolchain = "toolchain_impl",
+    toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
+    visibility = ["//visibility:public"],
+)
diff --git a/compatibility/WORKSPACE b/compatibility/WORKSPACE
index 078fe63e02ff..2cd1a7382895 100644
--- a/compatibility/WORKSPACE
+++ b/compatibility/WORKSPACE
@@ -363,4 +363,4 @@ scala_repositories(
 
 load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
 
-scala_register_toolchains()
+register_toolchains("@daml//bazel_tools/scala:toolchain")
diff --git a/deps.bzl b/deps.bzl
index 32fa190c011d..16bade2dc30d 100644
--- a/deps.bzl
+++ b/deps.bzl
@@ -30,8 +30,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file"
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-rules_scala_version = "e4560ac332e9da731c1e50a76af2579c55836a5c"
-rules_scala_sha256 = "ccf19e8f966022eaaca64da559c6140b23409829cb315f2eff5dc3e757fb6ad8"
+rules_scala_version = "17791a18aa966cdf2babb004822e6c70a7decc76"
+rules_scala_sha256 = "a8faef92f59a4f1428ed9a93c7c313a996466a66ad64c119fc49b5c7dea98c59"
 
 rules_haskell_version = "673e74aea244a6a9ee1eccec719677c80348aebf"
 rules_haskell_sha256 = "73a06dc6e0d928ceeab64e2cd3159f863eb2e263ecc64d79e3952c770cd1ee51"