diff --git a/MODULE.bazel b/MODULE.bazel
index c08c07d..637936c 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -5,7 +5,7 @@ bazel_dep(name = "com_github_buildbarn_bb_storage")
 bazel_dep(name = "gazelle", version = "0.38.0")
 bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a")
 bazel_dep(name = "googletest", version = "1.15.2")
-bazel_dep(name = "rules_go", version = "0.50.0")
+bazel_dep(name = "rules_go", version = "0.50.1")
 bazel_dep(name = "rules_jsonnet", version = "0.6.0")
 bazel_dep(name = "rules_oci", version = "1.8.0")
 bazel_dep(name = "toolchains_llvm", version = "1.1.2")
@@ -20,6 +20,7 @@ git_override(
     module_name = "com_github_buildbarn_bb_storage",
     commit = "0941111f29e31905e4081e6262bccf0c123940ed",
     patches = [
+        "//:patches/com_buildbarn_bb_storage/containers.diff",
         "//:patches/com_buildbarn_bb_storage/workflows_template.diff",
     ],
     remote = "https://github.com/buildbarn/bb-storage.git",
diff --git a/patches/com_buildbarn_bb_storage/containers.diff b/patches/com_buildbarn_bb_storage/containers.diff
new file mode 100644
index 0000000..b3caa8e
--- /dev/null
+++ b/patches/com_buildbarn_bb_storage/containers.diff
@@ -0,0 +1,13 @@
+diff --git tools/container.bzl tools/container.bzl
+index e4aa679..9a6f756 100644
+--- tools/container.bzl
++++ tools/container.bzl
+@@ -32,7 +32,7 @@ def multiarch_go_image(name, binary):
+ 
+     for arch in ["amd64", "arm64"]:
+         arch_image_target = "{}_{}_image".format(name, arch)
+-        target_platform = "@rules_go//go/toolchain:linux_" + arch
++        target_platform = "@rules_go//go/toolchain:linux_" + arch + "_cgo"
+         images.append(arch_image_target)
+         platform_transition_filegroup(
+             name = arch_image_target,