diff --git a/WORKSPACE b/WORKSPACE
index 2b9ee27..9fcc5ef 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -22,14 +22,27 @@
 bazel_toolchains_repositories()
 
 load(
-    "@io_bazel_rules_docker//container:container.bzl",
-    "container_pull",
+    "@io_bazel_rules_docker//toolchains/docker:toolchain.bzl",
+    docker_toolchain_configure = "toolchain_configure",
+)
+
+docker_toolchain_configure(
+    name = "docker_config",
+    docker_path = "/usr/bin/docker",
+)
+
+load(
+    "@io_bazel_rules_docker//repositories:repositories.bzl",
     container_repositories = "repositories",
 )
 
 container_repositories()
 
 load(
+    "@io_bazel_rules_docker//container:container.bzl",
+    "container_pull",
+)
+load(
     "//repositories:images.bzl",
     bazel_toolchains_images = "images",
 )
diff --git a/repositories/images.bzl b/repositories/images.bzl
index c93a49c..0d2ac41 100644
--- a/repositories/images.bzl
+++ b/repositories/images.bzl
@@ -21,6 +21,8 @@
     "container_pull",
 )
 
+_REGISTRY = "marketplace.gcr.io"
+
 def images():
     """Pull containers used in bazel-toolchains.
 
@@ -73,7 +75,7 @@
         container_pull(
             name = "debian8",
             digest = toolchain_container_sha256s()["debian8"],
-            registry = "marketplace.gcr.io",
+            registry = _REGISTRY,
             repository = "google/debian8",
         )
 
@@ -81,7 +83,7 @@
         container_pull(
             name = "ubuntu16_04",
             digest = toolchain_container_sha256s()["ubuntu16_04"],
-            registry = "marketplace.gcr.io",
+            registry = _REGISTRY,
             repository = "google/ubuntu16_04",
         )
 
@@ -92,7 +94,7 @@
         container_pull(
             name = "debian8_python3",
             digest = toolchain_container_sha256s()["debian8_python3"],
-            registry = "marketplace.gcr.io",
+            registry = _REGISTRY,
             repository = "google/python",
         )
 
@@ -111,7 +113,7 @@
         container_pull(
             name = "debian8-clang",
             digest = toolchain_container_sha256s()["debian8_clang"],
-            registry = "marketplace.gcr.io",
+            registry = _REGISTRY,
             repository = "google/clang-debian8",
         )
 
@@ -119,7 +121,7 @@
         container_pull(
             name = "ubuntu16_04-clang",
             digest = toolchain_container_sha256s()["ubuntu16_04_clang"],
-            registry = "marketplace.gcr.io",
+            registry = _REGISTRY,
             repository = "google/clang-ubuntu",
         )
 
diff --git a/repositories/repositories.bzl b/repositories/repositories.bzl
index 3b80d39..464ed70 100644
--- a/repositories/repositories.bzl
+++ b/repositories/repositories.bzl
@@ -56,9 +56,9 @@
     if "io_bazel_rules_docker" not in excludes:
         http_archive(
             name = "io_bazel_rules_docker",
-            sha256 = "1ccd6836300593849cf3221342cde6ed9b989ae513335b67ea5950ec42c20d81",
-            strip_prefix = "rules_docker-2c9816ba7e2998c521e19171245105e3255009ec",
-            urls = ["https://github.com/bazelbuild/rules_docker/archive/2c9816ba7e2998c521e19171245105e3255009ec.tar.gz"],
+            sha256 = "8a04c209b1080506a0f16f81d6f9ce9f2d25f936e4c2f8c8dd1f8bbafa07ed49",
+            strip_prefix = "rules_docker-3732c9d05315bef6a3dbd195c545d6fea3b86880",
+            urls = ["https://github.com/bazelbuild/rules_docker/archive/3732c9d05315bef6a3dbd195c545d6fea3b86880.tar.gz"],
         )
 
         # Register the docker toolchain type