diff --git a/WORKSPACE b/WORKSPACE
index 3621ba4390..ea300cdd5b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -70,7 +70,7 @@ git_repository(
     name = "graknlabs_bazel_distribution",
     commit = "962f3a7e56942430c0ec120c24f9e9f2a9c2ce1a",
     remote = "https://github.com/graknlabs/bazel-distribution",
-    shallow_since = "1563544980 +0300",
+    shallow_since = "1569509514 +0300",
 )
 
 # Override default import in rules_go with special patch until
@@ -84,7 +84,7 @@ git_repository(
         "//third_party:com_github_gogo_protobuf-equal.patch",
     ],
     remote = "https://github.com/gogo/protobuf",
-    shallow_since = "1567336231 +0200",
+    shallow_since = "1571033717 +0200",
     # gazelle args: -go_prefix github.com/gogo/protobuf -proto legacy
 )
 
@@ -235,9 +235,9 @@ all_content = """filegroup(name = "all", srcs = glob(["**"]), visibility = ["//v
 
 http_archive(
     name = "rules_foreign_cc",
+    sha256 = "450563dc2938f38566a59596bb30a3e905fbbcc35b3fff5a1791b122bc140465",
     strip_prefix = "rules_foreign_cc-456425521973736ef346d93d3d6ba07d807047df",
     url = "https://github.com/bazelbuild/rules_foreign_cc/archive/456425521973736ef346d93d3d6ba07d807047df.zip",
-    sha256 = "450563dc2938f38566a59596bb30a3e905fbbcc35b3fff5a1791b122bc140465",
 )
 
 load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")
@@ -1283,8 +1283,9 @@ go_repository(
 
 go_repository(
     name = "com_github_cloudflare_roughtime",
-    commit = "d41fdcee702eb3e5c3296288a453b9340184d37e",
     importpath = "github.com/cloudflare/roughtime",
+    sum = "h1:jeSxE3fepJdhASERvBHI6RFkMhISv6Ir2JUybYLIVXs=",
+    version = "v0.0.0-20200205191924-a69ef1dab727",
 )
 
 go_repository(
diff --git a/tools/cross-toolchain/configs/clang/bazel_2.1.1/config/BUILD b/tools/cross-toolchain/configs/clang/bazel_2.1.1/config/BUILD
index 3ef592107b..dc77738e5f 100644
--- a/tools/cross-toolchain/configs/clang/bazel_2.1.1/config/BUILD
+++ b/tools/cross-toolchain/configs/clang/bazel_2.1.1/config/BUILD
@@ -40,14 +40,8 @@ platform(
         "@bazel_tools//platforms:linux",
         "@bazel_tools//tools/cpp:clang",
     ],
-    remote_execution_properties = """
-        properties: {
-          name: "container-image"
-          value:"docker://gcr.io/prysmaticlabs/rbe-worker@sha256:d7407d58cee310e7ab788bf4256bba704344630621d8507f3c9cf253c7fc664f"
-        }
-        properties {
-           name: "OSFamily"
-           value:  "Linux"
-        }
-        """,
+    exec_properties = {
+        "container-image": "docker://gcr.io/prysmaticlabs/rbe-worker@sha256:d7407d58cee310e7ab788bf4256bba704344630621d8507f3c9cf253c7fc664f",
+        "OSFamily": "Linux",
+    },
 )
diff --git a/tools/cross-toolchain/configs/gcc/bazel_2.1.1/config/BUILD b/tools/cross-toolchain/configs/gcc/bazel_2.1.1/config/BUILD
index 8232a56f1b..716d9efa53 100644
--- a/tools/cross-toolchain/configs/gcc/bazel_2.1.1/config/BUILD
+++ b/tools/cross-toolchain/configs/gcc/bazel_2.1.1/config/BUILD
@@ -23,7 +23,7 @@ toolchain(
     exec_compatible_with = [
         "@bazel_tools//platforms:x86_64",
         "@bazel_tools//platforms:linux",
-        "@bazel_tools//tools/cpp:clang",
+        "@bazel_tools//tools/cpp:gcc",
     ],
     target_compatible_with = [
         "@bazel_tools//platforms:linux",
@@ -38,16 +38,10 @@ platform(
     constraint_values = [
         "@bazel_tools//platforms:x86_64",
         "@bazel_tools//platforms:linux",
-        "@bazel_tools//tools/cpp:clang",
+        "@bazel_tools//tools/cpp:gcc",
     ],
-    remote_execution_properties = """
-        properties: {
-          name: "container-image"
-          value:"docker://gcr.io/prysmaticlabs/rbe-worker@sha256:d7407d58cee310e7ab788bf4256bba704344630621d8507f3c9cf253c7fc664f"
-        }
-        properties {
-           name: "OSFamily"
-           value:  "Linux"
-        }
-        """,
+    exec_properties = {
+        "container-image": "docker://gcr.io/prysmaticlabs/rbe-worker@sha256:d7407d58cee310e7ab788bf4256bba704344630621d8507f3c9cf253c7fc664f",
+        "OSFamily": "Linux",
+    },
 )
diff --git a/tools/cross-toolchain/rbe_toolchains_config.bzl b/tools/cross-toolchain/rbe_toolchains_config.bzl
index eaa85dacf0..39e34bacc5 100644
--- a/tools/cross-toolchain/rbe_toolchains_config.bzl
+++ b/tools/cross-toolchain/rbe_toolchains_config.bzl
@@ -48,6 +48,12 @@ def _rbe_toolchains_generator():
         config_repos = [
             "prysm_toolchains",
         ],
+        use_legacy_platform_definition = False,
+        exec_compatible_with = [
+            "@bazel_tools//platforms:x86_64",
+            "@bazel_tools//platforms:linux",
+            "@bazel_tools//tools/cpp:clang",
+        ],
     )
 
     rbe_autoconfig(
@@ -64,6 +70,12 @@ def _rbe_toolchains_generator():
         config_repos = [
             "prysm_toolchains",
         ],
+        use_legacy_platform_definition = False,
+        exec_compatible_with = [
+            "@bazel_tools//platforms:x86_64",
+            "@bazel_tools//platforms:linux",
+            "@bazel_tools//tools/cpp:gcc",
+        ],
     )
 
 def _generated_rbe_toolchains():
@@ -77,6 +89,12 @@ def _generated_rbe_toolchains():
         toolchain_config_spec_name = "clang",
         toolchain_config_suite_spec = _TOOLCHAIN_CONFIG_SUITE_SPEC,
         use_checked_in_confs = "Force",
+        use_legacy_platform_definition = False,
+        exec_compatible_with = [
+            "@bazel_tools//platforms:x86_64",
+            "@bazel_tools//platforms:linux",
+            "@bazel_tools//tools/cpp:clang",
+        ],
     )
 
 def rbe_toolchains_config():