diff --git a/WORKSPACE b/WORKSPACE
index 8c704fd..69402bf 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -13,6 +13,18 @@
 # limitations under the License.
 workspace(name = "io_bazel_ci")
 
+git_repository(
+    name = "io_bazel_rules_docker",
+    remote = "https://github.com/bazelbuild/rules_docker.git",
+    commit = "e770f81cef4165828df955f37b827874a884a1de",
+)
+
+load(
+  "@io_bazel_rules_docker//docker:docker.bzl",
+  "docker_repositories"
+)
+docker_repositories()
+
 # Docker base images
 load("//base:docker_pull.bzl", "docker_pull")
 
diff --git a/base/BUILD b/base/BUILD
index b5b73e9..b75beee 100644
--- a/base/BUILD
+++ b/base/BUILD
@@ -13,7 +13,7 @@
 # limitations under the License.
 package(default_visibility = ["//visibility:public"])
 
-load("@bazel_tools//tools/build_defs/docker:docker.bzl", "docker_build")
+load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")
 
 # Base ubuntu
 docker_build(
diff --git a/base/docker_pull.bzl b/base/docker_pull.bzl
index 6504370..5b08142 100644
--- a/base/docker_pull.bzl
+++ b/base/docker_pull.bzl
@@ -16,7 +16,7 @@
 
 def _impl(repository_ctx):
   repository_ctx.file("BUILD", """
-load("@bazel_tools//tools/build_defs/docker:docker.bzl", "docker_build")
+load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")
 
 docker_build(
     name = "image",
diff --git a/gerrit-github-sync/BUILD b/gerrit-github-sync/BUILD
index 463d027..5450adc 100644
--- a/gerrit-github-sync/BUILD
+++ b/gerrit-github-sync/BUILD
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # A slave for polling and syncing gerrit and github
-load("@bazel_tools//tools/build_defs/docker:docker.bzl", "docker_build")
+load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")
 
 docker_build(
     name = "gerrit-github-sync",
diff --git a/jenkins/BUILD b/jenkins/BUILD
index b943cf0..1f100a1 100644
--- a/jenkins/BUILD
+++ b/jenkins/BUILD
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Configuration for our Jenkins instance
-load("@bazel_tools//tools/build_defs/docker:docker.bzl", "docker_build")
+load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")
 load("//jenkins/build_defs:jenkins.bzl", "jenkins_node", "jenkins_docker_build", "jenkins_job", "jenkins_nodes", "jenkins_node_names")
 load("//jenkins/jobs:jobs.bzl", "JOBS_SUBSTITUTIONS", "STAGING_JOBS_SUBSTITUTIONS")
 
diff --git a/jenkins/base/BUILD b/jenkins/base/BUILD
index f27d79b..ce48c63 100644
--- a/jenkins/base/BUILD
+++ b/jenkins/base/BUILD
@@ -1,4 +1,4 @@
-load("@bazel_tools//tools/build_defs/docker:docker.bzl", "docker_build")
+load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")
 
 docker_build(
     name = "base",
diff --git a/jenkins/base/jenkins_base.bzl b/jenkins/base/jenkins_base.bzl
index b9cc5a9..383221e 100644
--- a/jenkins/base/jenkins_base.bzl
+++ b/jenkins/base/jenkins_base.bzl
@@ -38,7 +38,7 @@
     if len(config) >= 3 and config[2] == "pinned":
       repository_ctx.file(dest + ".pinned", "")
   repository_ctx.file("BUILD", """
-load("@bazel_tools//tools/build_defs/docker:docker.bzl", "docker_build")
+load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")
 
 docker_build(
   name = "image",
diff --git a/jenkins/build_defs/jenkins_docker_build.bzl b/jenkins/build_defs/jenkins_docker_build.bzl
index 60dee82..8b186e8 100644
--- a/jenkins/build_defs/jenkins_docker_build.bzl
+++ b/jenkins/build_defs/jenkins_docker_build.bzl
@@ -14,7 +14,7 @@
 
 # Creation of the docker container for the jenkins master.
 
-load("@bazel_tools//tools/build_defs/docker:docker.bzl", "docker_build")
+load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")
 load(":templates.bzl", "merge_files", "strip_suffix")
 load(":vars.bzl", "MAIL_SUBSTITUTIONS")
 
diff --git a/jenkins/build_defs/jenkins_node.bzl b/jenkins/build_defs/jenkins_node.bzl
index 9c4c8fa..ebe0056 100644
--- a/jenkins/build_defs/jenkins_node.bzl
+++ b/jenkins/build_defs/jenkins_node.bzl
@@ -14,7 +14,7 @@
 
 # Setup jenkins and build the corresponding docker images
 
-load("@bazel_tools//tools/build_defs/docker:docker.bzl", "docker_build")
+load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")
 load(":templates.bzl", "expand_template")
 
 JENKINS_SERVER = "http://jenkins:80"