diff --git a/metropolis/test/e2e/httpserver/BUILD.bazel b/metropolis/test/e2e/httpserver/BUILD.bazel
index 160ebf8..5d60598 100644
--- a/metropolis/test/e2e/httpserver/BUILD.bazel
+++ b/metropolis/test/e2e/httpserver/BUILD.bazel
@@ -30,7 +30,7 @@
     visibility = ["//visibility:private"],
 )
 
-load("@rules_oci//oci:defs.bzl", "oci_image", "oci_tarball")
+load("@rules_oci//oci:defs.bzl", "oci_image")
 
 oci_image(
     name = "httpserver_image",
@@ -40,10 +40,3 @@
     visibility = ["//metropolis/test/e2e:__pkg__"],
     workdir = "/app",
 )
-
-oci_tarball(
-    name = "httpserver_tarball",
-    image = ":httpserver_image",
-    repo_tags = ["bazel/metropolis/test/e2e/httpserver:httpserver_image"],
-    visibility = ["//metropolis/test/e2e:__pkg__"],
-)
diff --git a/metropolis/test/e2e/preseedtest/BUILD.bazel b/metropolis/test/e2e/preseedtest/BUILD.bazel
index 864ba59..fe9fda9 100644
--- a/metropolis/test/e2e/preseedtest/BUILD.bazel
+++ b/metropolis/test/e2e/preseedtest/BUILD.bazel
@@ -31,7 +31,7 @@
     visibility = ["//visibility:private"],
 )
 
-load("@rules_oci//oci:defs.bzl", "oci_image", "oci_tarball")
+load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
 
 oci_image(
     name = "preseedtest_image",
@@ -42,9 +42,16 @@
     workdir = "/app",
 )
 
-oci_tarball(
-    name = "preseedtest_tarball",
+oci_load(
+    name = "preseedtest_load",
     image = ":preseedtest_image",
     repo_tags = ["bazel/metropolis/test/e2e/preseedtest:preseedtest_image"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "preseedtest_tarball",
+    srcs = [":preseedtest_load"],
+    output_group = "tarball",
     visibility = ["//metropolis/node:__pkg__"],
 )