diff --git a/third_party/com_github_grpc_grpc_swift/BUILD.overlay b/third_party/com_github_grpc_grpc_swift/BUILD.overlay
index a3603f3ed..20dfcc676 100644
--- a/third_party/com_github_grpc_grpc_swift/BUILD.overlay
+++ b/third_party/com_github_grpc_grpc_swift/BUILD.overlay
@@ -1,6 +1,7 @@
 load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "swift_binary",
+    "swift_interop_hint",
     "swift_library",
 )
 
@@ -44,15 +45,20 @@ cc_library(
         "Sources/CgRPC/third_party/nanopb/**/*.c",
     ]) + ["Sources/CgRPC/shim/internal.h"],
     hdrs = ["Sources/CgRPC/shim/cgrpc.h"],
+    aspect_hints = [":CgRPC_swift_hint"],
     copts = ["-DPB_NO_PACKED_STRUCTS=1"],
     includes = ["Sources/CgRPC/include"],
-    tags = ["swift_module=CgRPC"],
     deps = [
         ":BoringSSL",
         "@zlib",
     ],
 )
 
+swift_interop_hint(
+    name = "CgRPC_swift_hint",
+    module_name = "CgRPC",
+)
+
 swift_binary(
     name = "protoc-gen-swiftgrpc",
     srcs = glob([