diff --git a/build/debs/BUILD b/build/debs/BUILD
index dca85b679d7..cbcecd4d14f 100644
--- a/build/debs/BUILD
+++ b/build/debs/BUILD
@@ -148,7 +148,7 @@ genrule(
     name = "cri-tools-data-%s" % goarch,
     package_dir = "/usr/bin",
     tags = ["manual"],
-    deps = ["@cri_tools_%s//file" % goarch],
+    deps = ["@cri_tools_linux-%s//file" % goarch],
 ) for goarch in NODE_PLATFORMS["linux"]]
 
 [k8s_deb(
diff --git a/build/rpms/BUILD b/build/rpms/BUILD
index 4b9778c8826..faecdc865f7 100644
--- a/build/rpms/BUILD
+++ b/build/rpms/BUILD
@@ -106,7 +106,7 @@ genrule(
 [pkg_rpm_for_goarch(
     name = "cri-tools",
     data = [
-        "@cri_tools_{GOARCH}//file",
+        "@cri_tools_linux-{GOARCH}//file",
     ],
     goarch = arch,
     spec_file = "cri-tools.spec",
diff --git a/build/workspace.bzl b/build/workspace.bzl
index 093940389cf..811d3c98c87 100644
--- a/build/workspace.bzl
+++ b/build/workspace.bzl
@@ -28,11 +28,14 @@ _CNI_TARBALL_ARCH_SHA256 = {
 
 CRI_TOOLS_VERSION = "1.16.1"
 _CRI_TARBALL_ARCH_SHA256 = {
-    "amd64": "19fed421710fccfe58f5573383bb137c19438a9056355556f1a15da8d23b3ad1",
-    "arm": "367826f3eb06c4d923f3174d23141ddacef9ffcb0c902502bd922dbad86d08dd",
-    "arm64": "62b60ab7046b788df892a1b746bd602c520a59c38232febc0580692c9805f641",
-    "ppc64le": "d6464188a5011242b8dad22cb1e55d8cb29d6873f3d1f3f3c32bb236d3fca64e",
-    "s390x": "f3d5e707810d7985f6a470ea439ca5989c0ee218a824795ed1726f4958281a2d",
+    "linux-386": "35b721a7a90a12cf9689fb1f4fe5b50f73520200130a52b552234bd798d2ae9f",
+    "linux-amd64": "19fed421710fccfe58f5573383bb137c19438a9056355556f1a15da8d23b3ad1",
+    "linux-arm": "367826f3eb06c4d923f3174d23141ddacef9ffcb0c902502bd922dbad86d08dd",
+    "linux-arm64": "62b60ab7046b788df892a1b746bd602c520a59c38232febc0580692c9805f641",
+    "linux-ppc64le": "d6464188a5011242b8dad22cb1e55d8cb29d6873f3d1f3f3c32bb236d3fca64e",
+    "linux-s390x": "f3d5e707810d7985f6a470ea439ca5989c0ee218a824795ed1726f4958281a2d",
+    "windows-386": "b7564675f69aa2a01b092874c9c9aeda084204384d711a6fb85c6d2328ca5c7d",
+    "windows-amd64": "7d092dcb3b1af2edf75477d5d049a70e8c0d1ac8242b1dff2de7e6aa084e3615",
 }
 
 ETCD_VERSION = "3.3.17"
@@ -65,7 +68,7 @@ def cri_tarballs():
             name = "cri_tools_%s" % arch,
             downloaded_file_path = "cri_tools.tgz",
             sha256 = sha,
-            urls = mirror("https://github.com/kubernetes-incubator/cri-tools/releases/download/v%s/crictl-v%s-linux-%s.tar.gz" % (CRI_TOOLS_VERSION, CRI_TOOLS_VERSION, arch)),
+            urls = mirror("https://github.com/kubernetes-incubator/cri-tools/releases/download/v%s/crictl-v%s-%s.tar.gz" % (CRI_TOOLS_VERSION, CRI_TOOLS_VERSION, arch)),
         )
 
 # Use go get -u github.com/estesp/manifest-tool to find these values