diff --git a/aws/BUILD.bazel b/aws/BUILD.bazel
index f2a2195..ead0101 100644
--- a/aws/BUILD.bazel
+++ b/aws/BUILD.bazel
@@ -32,17 +32,29 @@ bzl_library(
     ],
 )
 
+bzl_library(
+    name = "extensions",
+    srcs = ["extensions.bzl"],
+    visibility = ["//visibility:public"],
+    deps = [":repositories"],
+)
+
 bzl_library(
     name = "defs",
     srcs = ["defs.bzl"],
     visibility = ["//visibility:public"],
+    deps = [
+        "//aws/private:py_lambda",
+        "@rules_oci//oci:defs",
+        "@rules_python//python:defs_bzl",
+    ],
 )
 
 bzl_library(
-    name = "extensions",
-    srcs = ["extensions.bzl"],
+    name = "repositories.oci",
+    srcs = ["repositories.oci.bzl"],
     visibility = ["//visibility:public"],
-    deps = [":repositories"],
+    deps = ["@rules_oci//oci:pull"],
 )
 
 bzl_library(
diff --git a/aws/defs.bzl b/aws/defs.bzl
index 2f09642..1cba007 100644
--- a/aws/defs.bzl
+++ b/aws/defs.bzl
@@ -1,8 +1,8 @@
 "Public API re-exports"
 
 load("@rules_oci//oci:defs.bzl", "oci_image")
-load("//aws/private:py_lambda.bzl", "py_lambda_tars")
 load("@rules_python//python:defs.bzl", "py_binary")
+load("//aws/private:py_lambda.bzl", "py_lambda_tars")
 
 def aws_py_lambda(name, entry_point = "lambda_function.py", deps = [], base = "@aws_lambda_python"):
     """Defines a Lambda run on the Python runtime.
diff --git a/aws/private/BUILD.bazel b/aws/private/BUILD.bazel
index 59eee2e..3a7844c 100644
--- a/aws/private/BUILD.bazel
+++ b/aws/private/BUILD.bazel
@@ -17,3 +17,12 @@ bzl_library(
     srcs = ["resolved_toolchain.bzl"],
     visibility = ["//aws:__subpackages__"],
 )
+
+bzl_library(
+    name = "py_lambda",
+    srcs = [
+        "py_lambda.bzl",
+        "@rules_pkg//pkg:bzl_srcs",
+    ],
+    visibility = ["//aws:__subpackages__"],
+)
diff --git a/examples/cli/BUILD.bazel b/examples/cli/BUILD.bazel
index c768449..c7bd5dd 100644
--- a/examples/cli/BUILD.bazel
+++ b/examples/cli/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@aspect_bazel_lib//lib:testing.bzl", "assert_contains")
 load("@aspect_bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
 load("@rules_oci//oci:defs.bzl", "oci_image", "oci_tarball")
+load("@rules_pkg//:pkg.bzl", "pkg_tar")
 
 # Demonstrates that you can use the CLI in a genrule.
 # The toolchain provides a "Make variable" named AWS_CLI_BIN that you can expand.
diff --git a/examples/python_lambda/BUILD.bazel b/examples/python_lambda/BUILD.bazel
index 19183da..3b18d77 100644
--- a/examples/python_lambda/BUILD.bazel
+++ b/examples/python_lambda/BUILD.bazel
@@ -1,9 +1,9 @@
 "Example Python AWS lambda using a container"
 
 load("@aspect_rules_aws//aws:defs.bzl", "aws_py_lambda")
+load("@pip//:requirements.bzl", "requirement")
 load("@rules_oci//oci:defs.bzl", "oci_tarball")
 load("@rules_python//python:pip.bzl", "compile_pip_requirements")
-load("@pip//:requirements.bzl", "requirement")
 
 compile_pip_requirements(
     name = "requirements",