diff --git a/ic-os/guestos/envs/local-base-dev/BUILD.bazel b/ic-os/guestos/envs/local-base-dev/BUILD.bazel
index 5f86fbb5b44..ab0d2b6e912 100644
--- a/ic-os/guestos/envs/local-base-dev/BUILD.bazel
+++ b/ic-os/guestos/envs/local-base-dev/BUILD.bazel
@@ -1,8 +1,6 @@
 load("//ic-os:defs.bzl", "icos_build")
 load("//ic-os/guestos:defs.bzl", "image_deps")
 
-package(default_visibility = ["//ic-os/guestos:__subpackages__"])
-
 # The macro contains several targets.
 # Check
 #       //ic-os/guestos/BUILD.bazel for examples
@@ -14,4 +12,5 @@ icos_build(
     image_deps_func = image_deps,
     tags = ["manual"],
     upload_prefix = None,  # Do not upload locally built base images
+    visibility = ["//rs:ic-os-pkg"],
 )
diff --git a/ic-os/guestos/envs/local-base-prod/BUILD.bazel b/ic-os/guestos/envs/local-base-prod/BUILD.bazel
index c78d3c98054..021e01ce1ed 100644
--- a/ic-os/guestos/envs/local-base-prod/BUILD.bazel
+++ b/ic-os/guestos/envs/local-base-prod/BUILD.bazel
@@ -1,8 +1,6 @@
 load("//ic-os:defs.bzl", "icos_build")
 load("//ic-os/guestos:defs.bzl", "image_deps")
 
-package(default_visibility = ["//ic-os/guestos:__subpackages__"])
-
 # The macro contains several targets.
 # Check
 #       //ic-os/guestos/BUILD.bazel for examples
@@ -13,4 +11,5 @@ icos_build(
     image_deps_func = image_deps,
     tags = ["manual"],
     upload_prefix = None,  # Do not upload locally built base images
+    visibility = ["//rs:ic-os-pkg"],
 )