diff --git a/ci/bazel_build_deps.sh b/ci/bazel_build_deps.sh
index 2c4a2a25920..d14cd10c641 100755
--- a/ci/bazel_build_deps.sh
+++ b/ci/bazel_build_deps.sh
@@ -133,7 +133,7 @@ function compute_targets() {
     fi
   done
 
-  targets+=("rdeps(//..., set(${changed_files[*]}))")
+  targets+=("rdeps(//..., set(${changed_files[*]}))  intersect //...")
 }
 
 function check_bpf_trigger() {
diff --git a/src/shared/artifacts/versionspb/versions.pb.go b/src/shared/artifacts/versionspb/versions.pb.go
index ebc78e3af3b..6c46ade32fc 100755
--- a/src/shared/artifacts/versionspb/versions.pb.go
+++ b/src/shared/artifacts/versionspb/versions.pb.go
@@ -33,6 +33,7 @@ const (
 	AT_UNKNOWN                      ArtifactType = 0
 	AT_LINUX_AMD64                  ArtifactType = 1
 	AT_DARWIN_AMD64                 ArtifactType = 2
+	AT_DARWIN_ARM64                 ArtifactType = 3
 	AT_CONTAINER_SET_YAMLS          ArtifactType = 50
 	AT_CONTAINER_SET_TEMPLATE_YAMLS ArtifactType = 60
 	AT_CONTAINER_SET_LINUX_AMD64    ArtifactType = 100
@@ -42,6 +43,7 @@ var ArtifactType_name = map[int32]string{
 	0:   "AT_UNKNOWN",
 	1:   "AT_LINUX_AMD64",
 	2:   "AT_DARWIN_AMD64",
+	3:   "AT_DARWIN_ARM64",
 	50:  "AT_CONTAINER_SET_YAMLS",
 	60:  "AT_CONTAINER_SET_TEMPLATE_YAMLS",
 	100: "AT_CONTAINER_SET_LINUX_AMD64",
@@ -51,6 +53,7 @@ var ArtifactType_value = map[string]int32{
 	"AT_UNKNOWN":                      0,
 	"AT_LINUX_AMD64":                  1,
 	"AT_DARWIN_AMD64":                 2,
+	"AT_DARWIN_ARM64":                 3,
 	"AT_CONTAINER_SET_YAMLS":          50,
 	"AT_CONTAINER_SET_TEMPLATE_YAMLS": 60,
 	"AT_CONTAINER_SET_LINUX_AMD64":    100,
@@ -266,43 +269,44 @@ func init() {
 }
 
 var fileDescriptor_11101fe785e211c4 = []byte{
-	// 574 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xcd, 0x6e, 0xda, 0x4c,
-	0x14, 0xf5, 0x00, 0x1f, 0x0a, 0x97, 0x7c, 0x49, 0x34, 0x51, 0x2b, 0x17, 0xa1, 0x01, 0xd1, 0x4d,
-	0x54, 0xa9, 0x46, 0x75, 0x9b, 0xa8, 0x8b, 0xaa, 0xaa, 0x69, 0x90, 0x82, 0x0a, 0x4e, 0x35, 0x18,
-	0xa5, 0xcd, 0x66, 0x34, 0x10, 0xc7, 0xb6, 0x84, 0xb1, 0xe5, 0x31, 0x51, 0xb3, 0xeb, 0x23, 0x54,
-	0xea, 0x4b, 0x54, 0x7d, 0x92, 0x2e, 0x59, 0x66, 0x15, 0x15, 0xb3, 0xe9, 0x32, 0x8f, 0x50, 0xc5,
-	0x3f, 0x80, 0x44, 0xd4, 0xdd, 0xbd, 0xe7, 0x9c, 0xcb, 0x39, 0xdc, 0x3b, 0x06, 0x45, 0x04, 0xa3,
-	0xa6, 0xb0, 0x79, 0x60, 0x5e, 0x34, 0x79, 0x10, 0x3a, 0x97, 0x7c, 0x14, 0x8a, 0xe6, 0x95, 0x19,
-	0x08, 0xc7, 0x9b, 0x08, 0x7f, 0xb8, 0x2c, 0x15, 0x3f, 0xf0, 0x42, 0x0f, 0x97, 0xfd, 0x2f, 0x4a,
-	0x06, 0x55, 0x9e, 0x5b, 0x4e, 0x68, 0x4f, 0x87, 0xca, 0xc8, 0x73, 0x9b, 0x96, 0x67, 0x79, 0xcd,
-	0x58, 0x33, 0x9c, 0x5e, 0xc6, 0x5d, 0xdc, 0xc4, 0x55, 0x32, 0x5b, 0xa9, 0x59, 0x9e, 0x67, 0x8d,
-	0xcd, 0x95, 0x2a, 0x74, 0x5c, 0x53, 0x84, 0xdc, 0xf5, 0x13, 0x41, 0xc3, 0x80, 0xb2, 0x96, 0x66,
-	0xe8, 0x9b, 0x21, 0xc6, 0x50, 0x98, 0x70, 0xd7, 0x94, 0x51, 0x1d, 0x1d, 0x94, 0x68, 0x5c, 0xe3,
-	0x17, 0xb0, 0x95, 0xc5, 0x94, 0x73, 0xf5, 0xfc, 0x41, 0x59, 0x7d, 0xa4, 0xac, 0x45, 0x52, 0xb2,
-	0x79, 0xba, 0x94, 0x35, 0xbe, 0x23, 0xd8, 0xcd, 0xe0, 0x9e, 0x13, 0x04, 0x5e, 0x20, 0xf0, 0x5b,
-	0xf8, 0x3f, 0xe3, 0x59, 0x78, 0xed, 0x27, 0x1e, 0x3b, 0xea, 0x93, 0x07, 0x7f, 0xcb, 0xb8, 0xf6,
-	0x4d, 0xba, 0xcd, 0xd7, 0x3a, 0xdc, 0x80, 0xa2, 0xb0, 0xb9, 0x7a, 0x78, 0x24, 0xe7, 0xee, 0xc3,
-	0xb5, 0x20, 0xba, 0xad, 0x15, 0xfb, 0x27, 0x9a, 0x7a, 0x78, 0x44, 0x53, 0x06, 0x57, 0xa1, 0x30,
-	0x0d, 0xc6, 0x42, 0xce, 0xd7, 0xf3, 0x07, 0xa5, 0xd6, 0x56, 0x74, 0x5b, 0x2b, 0x0c, 0x68, 0x57,
-	0xd0, 0x18, 0x6d, 0xcc, 0x72, 0xb0, 0x95, 0x19, 0xe0, 0xd7, 0x50, 0x5a, 0xee, 0x22, 0x8e, 0x52,
-	0x56, 0x2b, 0x4a, 0xb2, 0x2d, 0x25, 0xdb, 0x96, 0x62, 0x64, 0x0a, 0xba, 0x12, 0xe3, 0x1a, 0x94,
-	0x47, 0x9e, 0xeb, 0x3a, 0x21, 0xb3, 0xb9, 0xb0, 0x93, 0x34, 0x14, 0x12, 0xe8, 0x84, 0x0b, 0xfb,
-	0x5e, 0x90, 0xfe, 0x21, 0x26, 0xc2, 0x40, 0xce, 0x27, 0x82, 0x14, 0xea, 0x87, 0x01, 0xd6, 0x61,
-	0x9f, 0x5f, 0x71, 0x67, 0xcc, 0x87, 0x63, 0x93, 0x2d, 0x9f, 0x80, 0x5c, 0xa8, 0xe7, 0xff, 0xb9,
-	0x90, 0x56, 0x4e, 0x46, 0x14, 0x2f, 0x27, 0x33, 0x4a, 0xe0, 0x2a, 0x94, 0x46, 0x36, 0x9f, 0x58,
-	0xe6, 0xd8, 0xb3, 0xe4, 0xff, 0x62, 0xbb, 0x15, 0x80, 0xcf, 0xa1, 0xb2, 0xe9, 0xc6, 0xdc, 0xe4,
-	0x2c, 0x72, 0x31, 0xbe, 0x68, 0xf5, 0x41, 0xd3, 0xf4, 0x74, 0x54, 0xde, 0xf0, 0x4c, 0x99, 0x67,
-	0x3f, 0x11, 0x6c, 0xaf, 0x47, 0xc4, 0x3b, 0x00, 0x9a, 0xc1, 0x06, 0xfa, 0x07, 0xfd, 0xf4, 0x4c,
-	0xdf, 0x93, 0x30, 0x86, 0x1d, 0xcd, 0x60, 0xdd, 0x8e, 0x3e, 0xf8, 0xc4, 0xb4, 0xde, 0xf1, 0xd1,
-	0xab, 0x3d, 0x84, 0xf7, 0x61, 0x57, 0x33, 0xd8, 0xb1, 0x46, 0xcf, 0x3a, 0x7a, 0x0a, 0xe6, 0x70,
-	0x05, 0x1e, 0x6b, 0x06, 0x7b, 0x7f, 0xaa, 0x1b, 0x5a, 0x47, 0x6f, 0x53, 0xd6, 0x6f, 0x1b, 0xec,
-	0xb3, 0xd6, 0xeb, 0xf6, 0xf7, 0x54, 0xfc, 0x14, 0x6a, 0x1b, 0x9c, 0xd1, 0xee, 0x7d, 0xec, 0x6a,
-	0x46, 0x3b, 0x15, 0xbd, 0xc1, 0x75, 0xa8, 0x6e, 0x88, 0xd6, 0x7d, 0x2f, 0x5a, 0xef, 0x66, 0x73,
-	0x22, 0xdd, 0xcc, 0x89, 0x74, 0x37, 0x27, 0xe8, 0x6b, 0x44, 0xd0, 0x8f, 0x88, 0xa0, 0x5f, 0x11,
-	0x41, 0xb3, 0x88, 0xa0, 0xdf, 0x11, 0x41, 0x7f, 0x22, 0x22, 0xdd, 0x45, 0x04, 0x7d, 0x5b, 0x10,
-	0x69, 0xb6, 0x20, 0xd2, 0xcd, 0x82, 0x48, 0xe7, 0xb0, 0xfa, 0x32, 0x87, 0xc5, 0xf8, 0x65, 0xbc,
-	0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x27, 0x95, 0x5d, 0xd7, 0xc3, 0x03, 0x00, 0x00,
+	// 583 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xcd, 0x6a, 0xdb, 0x4c,
+	0x14, 0xd5, 0x58, 0xfe, 0x4c, 0x7c, 0x9d, 0x2f, 0x31, 0x13, 0x5a, 0x54, 0x63, 0xc6, 0xc6, 0xdd,
+	0x84, 0x42, 0x65, 0xaa, 0x26, 0xa6, 0x8b, 0x52, 0x2a, 0x37, 0x86, 0x84, 0xda, 0x4a, 0x19, 0x2b,
+	0xa4, 0xcd, 0x66, 0x18, 0x3b, 0x8a, 0x24, 0xb0, 0x22, 0xa1, 0x51, 0x42, 0xb3, 0xeb, 0x23, 0x14,
+	0xfa, 0x12, 0x7d, 0x8b, 0x6e, 0xbb, 0xf4, 0x32, 0xab, 0xd0, 0xc8, 0x9b, 0x2e, 0xf3, 0x08, 0x25,
+	0xfa, 0xb1, 0x4d, 0x1d, 0xba, 0xbb, 0xf7, 0x9c, 0x73, 0x7d, 0x8e, 0xef, 0x1d, 0x81, 0x2a, 0xc2,
+	0x71, 0x5b, 0x38, 0x3c, 0xb4, 0x4e, 0xdb, 0x3c, 0x8c, 0xdc, 0x33, 0x3e, 0x8e, 0x44, 0xfb, 0xd2,
+	0x0a, 0x85, 0xeb, 0x9f, 0x8b, 0x60, 0x34, 0x2f, 0xd5, 0x20, 0xf4, 0x23, 0x1f, 0x57, 0x82, 0xcf,
+	0x6a, 0x0e, 0xd5, 0x9e, 0xdb, 0x6e, 0xe4, 0x5c, 0x8c, 0xd4, 0xb1, 0xef, 0xb5, 0x6d, 0xdf, 0xf6,
+	0xdb, 0x89, 0x66, 0x74, 0x71, 0x96, 0x74, 0x49, 0x93, 0x54, 0xe9, 0x6c, 0xad, 0x61, 0xfb, 0xbe,
+	0x3d, 0xb1, 0x16, 0xaa, 0xc8, 0xf5, 0x2c, 0x11, 0x71, 0x2f, 0x48, 0x05, 0x2d, 0x13, 0x2a, 0x7a,
+	0x96, 0x61, 0x68, 0x45, 0x18, 0x43, 0xf1, 0x9c, 0x7b, 0x96, 0x82, 0x9a, 0x68, 0xbb, 0x4c, 0x93,
+	0x1a, 0xbf, 0x80, 0xb5, 0x3c, 0xa6, 0x52, 0x68, 0xca, 0xdb, 0x15, 0xed, 0x91, 0xba, 0x14, 0x49,
+	0xcd, 0xe7, 0xe9, 0x5c, 0xd6, 0xfa, 0x86, 0x60, 0x33, 0x87, 0x07, 0x6e, 0x18, 0xfa, 0xa1, 0xc0,
+	0x6f, 0xe0, 0xff, 0x9c, 0x67, 0xd1, 0x55, 0x90, 0x7a, 0x6c, 0x68, 0x4f, 0x1e, 0xfc, 0x2d, 0xf3,
+	0x2a, 0xb0, 0xe8, 0x3a, 0x5f, 0xea, 0x70, 0x0b, 0x4a, 0xc2, 0xe1, 0xda, 0x6e, 0x47, 0x29, 0xdc,
+	0x87, 0xeb, 0x42, 0x7c, 0xd3, 0x28, 0x0d, 0xf7, 0x75, 0x6d, 0xb7, 0x43, 0x33, 0x06, 0xd7, 0xa1,
+	0x78, 0x11, 0x4e, 0x84, 0x22, 0x37, 0xe5, 0xed, 0x72, 0x77, 0x2d, 0xbe, 0x69, 0x14, 0x8f, 0x68,
+	0x5f, 0xd0, 0x04, 0x6d, 0x4d, 0x0b, 0xb0, 0x96, 0x1b, 0xe0, 0x57, 0x50, 0x9e, 0xef, 0x22, 0x89,
+	0x52, 0xd1, 0x6a, 0x6a, 0xba, 0x2d, 0x35, 0xdf, 0x96, 0x6a, 0xe6, 0x0a, 0xba, 0x10, 0xe3, 0x06,
+	0x54, 0xc6, 0xbe, 0xe7, 0xb9, 0x11, 0x73, 0xb8, 0x70, 0xd2, 0x34, 0x14, 0x52, 0x68, 0x9f, 0x0b,
+	0xe7, 0x5e, 0x90, 0xfd, 0x21, 0x26, 0xa2, 0x50, 0x91, 0x53, 0x41, 0x06, 0x0d, 0xa3, 0x10, 0x1b,
+	0xb0, 0xc5, 0x2f, 0xb9, 0x3b, 0xe1, 0xa3, 0x89, 0xc5, 0xe6, 0x4f, 0x40, 0x29, 0x36, 0xe5, 0x7f,
+	0x2e, 0xa4, 0x5b, 0x50, 0x10, 0xc5, 0xf3, 0xc9, 0x9c, 0x12, 0xb8, 0x0e, 0xe5, 0xb1, 0xc3, 0xcf,
+	0x6d, 0x6b, 0xe2, 0xdb, 0xca, 0x7f, 0x89, 0xdd, 0x02, 0xc0, 0x27, 0x50, 0x5b, 0x75, 0x63, 0x5e,
+	0x7a, 0x16, 0xa5, 0x94, 0x5c, 0xb4, 0xfe, 0xa0, 0x69, 0x76, 0x3a, 0xaa, 0xac, 0x78, 0x66, 0xcc,
+	0xb3, 0x1f, 0x08, 0xd6, 0x97, 0x23, 0xe2, 0x0d, 0x00, 0xdd, 0x64, 0x47, 0xc6, 0x7b, 0xe3, 0xf0,
+	0xd8, 0xa8, 0x4a, 0x18, 0xc3, 0x86, 0x6e, 0xb2, 0xfe, 0x81, 0x71, 0xf4, 0x91, 0xe9, 0x83, 0xbd,
+	0xce, 0x4e, 0x15, 0xe1, 0x2d, 0xd8, 0xd4, 0x4d, 0xb6, 0xa7, 0xd3, 0xe3, 0x03, 0x23, 0x03, 0x0b,
+	0x7f, 0x81, 0x74, 0xd0, 0xd9, 0xa9, 0xca, 0xb8, 0x06, 0x8f, 0x75, 0x93, 0xbd, 0x3b, 0x34, 0x4c,
+	0xfd, 0xc0, 0xe8, 0x51, 0x36, 0xec, 0x99, 0xec, 0x93, 0x3e, 0xe8, 0x0f, 0xab, 0x1a, 0x7e, 0x0a,
+	0x8d, 0x15, 0xce, 0xec, 0x0d, 0x3e, 0xf4, 0x75, 0xb3, 0x97, 0x89, 0x5e, 0xe3, 0x26, 0xd4, 0x57,
+	0x44, 0xcb, 0x61, 0x4e, 0xbb, 0x6f, 0xa7, 0xb7, 0x44, 0xba, 0xbe, 0x25, 0xd2, 0xdd, 0x2d, 0x41,
+	0x5f, 0x62, 0x82, 0xbe, 0xc7, 0x04, 0xfd, 0x8c, 0x09, 0x9a, 0xc6, 0x04, 0xfd, 0x8a, 0x09, 0xfa,
+	0x1d, 0x13, 0xe9, 0x2e, 0x26, 0xe8, 0xeb, 0x8c, 0x48, 0xd3, 0x19, 0x91, 0xae, 0x67, 0x44, 0x3a,
+	0x81, 0xc5, 0xe7, 0x3a, 0x2a, 0x25, 0xcf, 0xe5, 0xe5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3d,
+	0x32, 0x0a, 0x38, 0xd8, 0x03, 0x00, 0x00,
 }
 
 func (x ArtifactType) String() string {
diff --git a/src/shared/artifacts/versionspb/versions.proto b/src/shared/artifacts/versionspb/versions.proto
index 20f4213046a..e055fae69c9 100644
--- a/src/shared/artifacts/versionspb/versions.proto
+++ b/src/shared/artifacts/versionspb/versions.proto
@@ -30,6 +30,7 @@ enum ArtifactType {
   AT_UNKNOWN = 0;
   AT_LINUX_AMD64 = 1;
   AT_DARWIN_AMD64 = 2;
+  AT_DARWIN_ARM64 = 3;
   AT_CONTAINER_SET_YAMLS = 50;
   AT_CONTAINER_SET_TEMPLATE_YAMLS = 60;
   AT_CONTAINER_SET_LINUX_AMD64 = 100;