diff --git a/WORKSPACE b/WORKSPACE
index e30307b..c29725a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -14,7 +14,7 @@
 workspace(name = "bazel_toolchains")
 
 load(
-    "//skylib:package_names.bzl",
+    "//rules/skylib:package_names.bzl",
     "jessie_package_names",
 )
 load(
diff --git a/container/common/BUILD b/container/common/BUILD
index c19ce8b..343ada9 100644
--- a/container/common/BUILD
+++ b/container/common/BUILD
@@ -19,11 +19,11 @@
 exports_files(glob(["*.yaml"]))
 
 load(
-    "//third_party/golang:revision.bzl",
+    "@bazel_toolchains//third_party/golang:revision.bzl",
     "GOLANG_REVISION",
 )
 load(
-    "//third_party/openjdk:revision.bzl",
+    "@bazel_toolchains//third_party/openjdk:revision.bzl",
     "JDK_VERSION",
     "JDK_VERSION_DECODED",
 )
diff --git a/container/common/bazel/BUILD b/container/common/bazel/BUILD
index caa7089..771d654 100644
--- a/container/common/bazel/BUILD
+++ b/container/common/bazel/BUILD
@@ -16,7 +16,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load("//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
+load("@bazel_toolchains//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
 
 exports_files(glob(["**"]))
 
diff --git a/container/common/clang/BUILD b/container/common/clang/BUILD
index 5fce108..808a9ae 100644
--- a/container/common/clang/BUILD
+++ b/container/common/clang/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//third_party/clang:revision.bzl",
+    "@bazel_toolchains//third_party/clang:revision.bzl",
     "CLANG_REVISION",
 )
 
diff --git a/container/debian8/builders/bazel/BUILD b/container/debian8/builders/bazel/BUILD
index 1c88765..4abb030 100644
--- a/container/debian8/builders/bazel/BUILD
+++ b/container/debian8/builders/bazel/BUILD
@@ -17,13 +17,13 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
     "toolchain_container",
 )
 load("@io_bazel_rules_docker//container:container.bzl", "container_image")
 load("@io_bazel_rules_docker//contrib:test.bzl", "container_test")
-load("//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
+load("@bazel_toolchains//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
 
 # Tools that are needed in most builds, but not strictly required by bazel.
 language_tool_layer(
diff --git a/container/debian8/builders/rbe-debian8/BUILD b/container/debian8/builders/rbe-debian8/BUILD
index 02d0f96..3dab81e 100644
--- a/container/debian8/builders/rbe-debian8/BUILD
+++ b/container/debian8/builders/rbe-debian8/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
     "toolchain_container",
 )
diff --git a/container/debian8/layers/bazel/BUILD b/container/debian8/layers/bazel/BUILD
index 03aaa9c..f220958 100644
--- a/container/debian8/layers/bazel/BUILD
+++ b/container/debian8/layers/bazel/BUILD
@@ -16,10 +16,10 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load("//container/rules:docker_toolchains.bzl", "language_tool_layer")
-load("//container/rules:docker_toolchains.bzl", "toolchain_container")
+load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "language_tool_layer")
+load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "toolchain_container")
 load("@base_images_docker//util:run.bzl", "container_run_and_extract")
-load("//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
+load("@bazel_toolchains//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
 
 # Tools required by Bazel. Note that we do not add a CC complier here as we
 # will include that in the final container.
diff --git a/container/debian8/layers/clang/BUILD b/container/debian8/layers/clang/BUILD
index dc60ff1..a3313a7 100644
--- a/container/debian8/layers/clang/BUILD
+++ b/container/debian8/layers/clang/BUILD
@@ -17,10 +17,10 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
 )
-load("//container/common/clang:clang.bzl", "clang_env")
+load("@bazel_toolchains//container/common/clang:clang.bzl", "clang_env")
 
 language_tool_layer(
     name = "clang-ltl",
diff --git a/container/debian8/layers/go/BUILD b/container/debian8/layers/go/BUILD
index b731324..47755a4 100644
--- a/container/debian8/layers/go/BUILD
+++ b/container/debian8/layers/go/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
 )
 
diff --git a/container/debian8/layers/java/BUILD b/container/debian8/layers/java/BUILD
index e2da70e..fc122ac 100644
--- a/container/debian8/layers/java/BUILD
+++ b/container/debian8/layers/java/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
 )
 
diff --git a/container/debian8/layers/python/BUILD b/container/debian8/layers/python/BUILD
index a4e5be7..fbef06a 100644
--- a/container/debian8/layers/python/BUILD
+++ b/container/debian8/layers/python/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
 )
 
diff --git a/container/experimental/rbe-debian8/BUILD b/container/experimental/rbe-debian8/BUILD
index fae54f3..6ac6ec6 100644
--- a/container/experimental/rbe-debian8/BUILD
+++ b/container/experimental/rbe-debian8/BUILD
@@ -19,7 +19,7 @@
 load("@distroless//cacerts:cacerts.bzl", "cacerts")
 load("@jessie_package_bundle//file:packages.bzl", "packages")
 load(
-    "//skylib:packages.bzl",
+    "@bazel_toolchains//skylib:packages.bzl",
     "base_layer_packages",
     "clang_layer_packages",
     "java_layer_packages",
diff --git a/container/experimental/rbe-debian9/BUILD b/container/experimental/rbe-debian9/BUILD
index 9d3ea2c..58a0cbf 100644
--- a/container/experimental/rbe-debian9/BUILD
+++ b/container/experimental/rbe-debian9/BUILD
@@ -17,12 +17,12 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
     "toolchain_container",
 )
 load("@io_bazel_rules_docker//contrib:test.bzl", "container_test")
-load("//container/common/clang:clang.bzl", "clang_env")
+load("@bazel_toolchains//container/common/clang:clang.bzl", "clang_env")
 
 JAVA_CLEANUP_COMMANDS = (
     "rm -rf " +
diff --git a/container/ubuntu14_04/builders/bazel/BUILD b/container/ubuntu14_04/builders/bazel/BUILD
index 07c09b9..2f7b838 100644
--- a/container/ubuntu14_04/builders/bazel/BUILD
+++ b/container/ubuntu14_04/builders/bazel/BUILD
@@ -17,13 +17,13 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
     "toolchain_container",
 )
 load("@io_bazel_rules_docker//container:container.bzl", "container_image")
 load("@io_bazel_rules_docker//contrib:test.bzl", "container_test")
-load("//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
+load("@bazel_toolchains//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
 
 # Tools that are needed in most builds, but not strictly required by bazel.
 language_tool_layer(
diff --git a/container/ubuntu14_04/layers/bazel/BUILD b/container/ubuntu14_04/layers/bazel/BUILD
index 42fc2b9..8988ba6 100644
--- a/container/ubuntu14_04/layers/bazel/BUILD
+++ b/container/ubuntu14_04/layers/bazel/BUILD
@@ -16,10 +16,10 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load("//container/rules:docker_toolchains.bzl", "language_tool_layer")
-load("//container/rules:docker_toolchains.bzl", "toolchain_container")
+load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "language_tool_layer")
+load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "toolchain_container")
 load("@base_images_docker//util:run.bzl", "container_run_and_extract")
-load("//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
+load("@bazel_toolchains//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
 
 # Tools required by Bazel. Note that we do not add a CC complier here as we
 # will include that in the final container.
diff --git a/container/ubuntu14_04/layers/gcc/BUILD b/container/ubuntu14_04/layers/gcc/BUILD
index 4d6ab68..a15ca39 100644
--- a/container/ubuntu14_04/layers/gcc/BUILD
+++ b/container/ubuntu14_04/layers/gcc/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
 )
 
diff --git a/container/ubuntu14_04/layers/java/BUILD b/container/ubuntu14_04/layers/java/BUILD
index 6a545f1..82618cd 100644
--- a/container/ubuntu14_04/layers/java/BUILD
+++ b/container/ubuntu14_04/layers/java/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
 )
 
diff --git a/container/ubuntu14_04/layers/python/BUILD b/container/ubuntu14_04/layers/python/BUILD
index 5096284..28ed6b5 100644
--- a/container/ubuntu14_04/layers/python/BUILD
+++ b/container/ubuntu14_04/layers/python/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
 )
 
diff --git a/container/ubuntu16_04/builders/bazel/BUILD b/container/ubuntu16_04/builders/bazel/BUILD
index 940b9e8..28a7cdd 100644
--- a/container/ubuntu16_04/builders/bazel/BUILD
+++ b/container/ubuntu16_04/builders/bazel/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
     "toolchain_container",
 )
diff --git a/container/ubuntu16_04/builders/bazel_docker_gcloud/BUILD b/container/ubuntu16_04/builders/bazel_docker_gcloud/BUILD
index a13b5da..018d6d7 100644
--- a/container/ubuntu16_04/builders/bazel_docker_gcloud/BUILD
+++ b/container/ubuntu16_04/builders/bazel_docker_gcloud/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
     "toolchain_container",
 )
diff --git a/container/ubuntu16_04/builders/rbe-ubuntu16_04/BUILD b/container/ubuntu16_04/builders/rbe-ubuntu16_04/BUILD
index c92a435..69c4558 100644
--- a/container/ubuntu16_04/builders/rbe-ubuntu16_04/BUILD
+++ b/container/ubuntu16_04/builders/rbe-ubuntu16_04/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
     "toolchain_container",
 )
diff --git a/container/ubuntu16_04/debian_pkgs/BUILD b/container/ubuntu16_04/debian_pkgs/BUILD
index 5ae66cc..6eb4bc2 100644
--- a/container/ubuntu16_04/debian_pkgs/BUILD
+++ b/container/ubuntu16_04/debian_pkgs/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:debian_pkg_tar.bzl",
+    "@bazel_toolchains//rules/container:debian_pkg_tar.bzl",
     "aggregate_debian_pkgs",
 )
 
diff --git a/container/ubuntu16_04/layers/bazel/BUILD b/container/ubuntu16_04/layers/bazel/BUILD
index 644c7b4..0849d68 100644
--- a/container/ubuntu16_04/layers/bazel/BUILD
+++ b/container/ubuntu16_04/layers/bazel/BUILD
@@ -16,10 +16,9 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load("//container/rules:docker_toolchains.bzl", "language_tool_layer")
-load("//container/rules:docker_toolchains.bzl", "toolchain_container")
+load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "language_tool_layer", "toolchain_container")
 load("@base_images_docker//util:run.bzl", "container_run_and_extract")
-load("//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
+load("@bazel_toolchains//container/common/bazel:version.bzl", "BAZEL_VERSION_SHA256S")
 
 # Tools required by Bazel. Note that we do not add a CC complier here as we
 # will include that in the final container.
diff --git a/container/ubuntu16_04/layers/clang/BUILD b/container/ubuntu16_04/layers/clang/BUILD
index b65dc27..b1a05c6 100644
--- a/container/ubuntu16_04/layers/clang/BUILD
+++ b/container/ubuntu16_04/layers/clang/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
 )
 load("//container/common/clang:clang.bzl", "clang_env")
diff --git a/container/ubuntu16_04/layers/docker-17.12.0/BUILD b/container/ubuntu16_04/layers/docker-17.12.0/BUILD
index 9d226af..f1bdd69 100644
--- a/container/ubuntu16_04/layers/docker-17.12.0/BUILD
+++ b/container/ubuntu16_04/layers/docker-17.12.0/BUILD
@@ -16,7 +16,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load("//container/rules:docker_toolchains.bzl", "language_tool_layer", "toolchain_container")
+load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "language_tool_layer", "toolchain_container")
 load("@base_images_docker//package_managers:apt_key.bzl", "add_apt_key")
 load("@base_images_docker//package_managers:download_pkgs.bzl", "download_pkgs")
 
diff --git a/container/ubuntu16_04/layers/gcloud/BUILD b/container/ubuntu16_04/layers/gcloud/BUILD
index 3e13fa6..1f7172f 100644
--- a/container/ubuntu16_04/layers/gcloud/BUILD
+++ b/container/ubuntu16_04/layers/gcloud/BUILD
@@ -16,9 +16,9 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load("//container/rules:docker_toolchains.bzl", "language_tool_layer")
+load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "language_tool_layer")
 load(
-    "//container/ubuntu16_04/layers/gcloud:version.bzl",
+    "@bazel_toolchains//container/ubuntu16_04/layers/gcloud:version.bzl",
     "GCLOUD_VERSION",
 )
 
diff --git a/container/ubuntu16_04/layers/go/BUILD b/container/ubuntu16_04/layers/go/BUILD
index fb5ce2e..41a5366 100644
--- a/container/ubuntu16_04/layers/go/BUILD
+++ b/container/ubuntu16_04/layers/go/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
 )
 
diff --git a/container/ubuntu16_04/layers/java/BUILD b/container/ubuntu16_04/layers/java/BUILD
index de95efc..0ddf0b5 100644
--- a/container/ubuntu16_04/layers/java/BUILD
+++ b/container/ubuntu16_04/layers/java/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
 )
 
diff --git a/container/ubuntu16_04/layers/python/BUILD b/container/ubuntu16_04/layers/python/BUILD
index f34543a..0c40086 100644
--- a/container/ubuntu16_04/layers/python/BUILD
+++ b/container/ubuntu16_04/layers/python/BUILD
@@ -17,7 +17,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "//container/rules:docker_toolchains.bzl",
+    "@bazel_toolchains//rules/container:docker_toolchains.bzl",
     "language_tool_layer",
 )
 
diff --git a/repositories/BUILD b/repositories/BUILD
index 45d3788..d55a1c7 100644
--- a/repositories/BUILD
+++ b/repositories/BUILD
@@ -15,3 +15,22 @@
 licenses(["notice"])  # Apache 2.0
 
 package(default_visibility = ["//visibility:public"])
+
+load("@bazel_skylib//:skylark_library.bzl", "skylark_library")
+
+skylark_library(
+    name = "images",
+    srcs = [
+        "images.bzl",
+    ],
+    deps = [
+        "//rules:toolchain_containers",
+    ],
+)
+
+skylark_library(
+    name = "repositories",
+    srcs = [
+        "images.bzl",
+    ],
+)
diff --git a/rules/BUILD b/rules/BUILD
index f7c8eef..d499b3d 100644
--- a/rules/BUILD
+++ b/rules/BUILD
@@ -23,6 +23,7 @@
 ])
 
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
+load("@bazel_skylib//:skylark_library.bzl", "skylark_library")
 
 pkg_tar(
     name = "cc-sample-project-tar",
@@ -31,3 +32,35 @@
         "cc-sample-project/test.cc",
     ],
 )
+
+skylark_library(
+    name = "environments",
+    srcs = [
+        "environments.bzl",
+    ],
+)
+
+skylark_library(
+    name = "toolchain_containers",
+    srcs = [
+        "toolchain_containers.bzl",
+    ],
+)
+
+skylark_library(
+    name = "gcs",
+    srcs = [
+        "gcs.bzl",
+    ],
+)
+
+skylark_library(
+    name = "docker_config",
+    srcs = [
+        "docker_config.bzl",
+    ],
+    deps = [
+        "@bazel_toolchains//rules/container:docker_toolchains",
+        "@io_bazel_rules_docker//container",
+    ],
+)
diff --git a/container/rules/BUILD b/rules/container/BUILD
similarity index 63%
rename from container/rules/BUILD
rename to rules/container/BUILD
index f6372ea..b4d55fb 100644
--- a/container/rules/BUILD
+++ b/rules/container/BUILD
@@ -13,3 +13,23 @@
 # limitations under the License.
 
 licenses(["notice"])  # Apache 2.0
+
+load("@bazel_skylib//:skylark_library.bzl", "skylark_library")
+
+skylark_library(
+    name = "debian_pkg_tar",
+    srcs = [
+        "debian_pkg_tar.bzl",
+    ],
+)
+
+skylark_library(
+    name = "docker_toolchains",
+    srcs = [
+        "docker_toolchains.bzl",
+    ],
+    deps = [
+        ":debian_pkg_tar",
+        "@io_bazel_rules_docker//container",
+    ],
+)
diff --git a/container/rules/debian_pkg_tar.bzl b/rules/container/debian_pkg_tar.bzl
similarity index 100%
rename from container/rules/debian_pkg_tar.bzl
rename to rules/container/debian_pkg_tar.bzl
diff --git a/container/rules/docker_toolchains.bzl b/rules/container/docker_toolchains.bzl
similarity index 100%
rename from container/rules/docker_toolchains.bzl
rename to rules/container/docker_toolchains.bzl
diff --git a/rules/docker_config.bzl b/rules/docker_config.bzl
index ca33340..247fb11 100644
--- a/rules/docker_config.bzl
+++ b/rules/docker_config.bzl
@@ -118,7 +118,7 @@
     "@io_bazel_rules_docker//container:container.bzl",
     _container = "container",
 )
-load("//container/rules:docker_toolchains.bzl", "toolchain_container")
+load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "toolchain_container")
 
 # External folder is set to be deprecated, lets keep it here for easy
 # refactoring
@@ -487,7 +487,7 @@
             name = kwargs["name"] + "_test",
             size = "medium",
             timeout = "long",
-            srcs = ["//test/configs:autoconfig_test.sh"],
+            srcs = ["@bazel_toolchains//test/configs:autoconfig_test.sh"],
             data = [":" + kwargs["name"]],
         )
 
diff --git a/rules/gcs.bzl b/rules/gcs.bzl
index 6739d4c..2d82a7e 100644
--- a/rules/gcs.bzl
+++ b/rules/gcs.bzl
@@ -45,7 +45,7 @@
     # Create a bash script from a template.
     ctx.template(
         "gsutil_cp_and_validate.sh",
-        Label("//rules:gsutil_cp_and_validate.sh.tpl"),
+        Label("@bazel_toolchains//rules:gsutil_cp_and_validate.sh.tpl"),
         {
             "%{BUCKET}": ctx.attr.bucket,
             "%{FILE}": ctx.attr.file,
diff --git a/skylib/BUILD b/rules/skylib/BUILD
similarity index 79%
rename from skylib/BUILD
rename to rules/skylib/BUILD
index b28ab12..278ccba 100644
--- a/skylib/BUILD
+++ b/rules/skylib/BUILD
@@ -16,4 +16,12 @@
 
 package(default_visibility = ["//visibility:public"])
 
-exports_files(["container_file_export.sh"])
+load("@bazel_skylib//:skylark_library.bzl", "skylark_library")
+
+skylark_library(
+    name = "packages",
+    srcs = [
+        "package_names.bzl",
+        "packages.bzl",
+    ],
+)
diff --git a/skylib/package_names.bzl b/rules/skylib/package_names.bzl
similarity index 100%
rename from skylib/package_names.bzl
rename to rules/skylib/package_names.bzl
diff --git a/skylib/packages.bzl b/rules/skylib/packages.bzl
similarity index 100%
rename from skylib/packages.bzl
rename to rules/skylib/packages.bzl
diff --git a/test/configs/BUILD b/test/configs/BUILD
index 0cfedfd..b5b81da 100644
--- a/test/configs/BUILD
+++ b/test/configs/BUILD
@@ -16,7 +16,7 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load("//container/rules:docker_toolchains.bzl", "toolchain_container")
+load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "toolchain_container")
 load("@bazel_toolchains//rules:docker_config.bzl", "docker_toolchain_autoconfig")
 load(
     "@bazel_toolchains//rules:environments.bzl",
diff --git a/test/container/BUILD b/test/container/BUILD
index 0998c83..cf6b63a 100644
--- a/test/container/BUILD
+++ b/test/container/BUILD
@@ -19,7 +19,7 @@
 load("@base_images_docker//package_managers:download_pkgs.bzl", "download_pkgs")
 load("@base_images_docker//package_managers:install_pkgs.bzl", "install_pkgs")
 load("@base_images_docker//package_managers:apt_key.bzl", "add_apt_key")
-load("//container/rules:docker_toolchains.bzl", "toolchain_container")
+load("@bazel_toolchains//rules/container:docker_toolchains.bzl", "toolchain_container")
 
 # This file contains some sample targets that excersise the container rules
 # We just keep these as examples that should not break (unless indicated)