diff --git a/csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel
index 379b8aea91da..801e7aedbab6 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel
+++ b/csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel
@@ -9,6 +9,7 @@ codeql_csharp_binary(
         "*.cs",
         "Properties/*.cs",
     ]),
+    language_prefix = "cpp",
     visibility = ["//visibility:public"],
     deps = [
         "//csharp/autobuilder/Semmle.Autobuild.Shared",
diff --git a/misc/bazel/csharp.bzl b/misc/bazel/csharp.bzl
index 7aeb21c40f5b..299febf53084 100644
--- a/misc/bazel/csharp.bzl
+++ b/misc/bazel/csharp.bzl
@@ -33,7 +33,7 @@ def codeql_xunit_test(name, **kwargs):
         **kwargs
     )
 
-def codeql_csharp_binary(name, **kwargs):
+def codeql_csharp_binary(name, language_prefix = "csharp", **kwargs):
     kwargs.setdefault("nullable", "enable")
     kwargs.setdefault("target_frameworks", [TARGET_FRAMEWORK])
 
@@ -63,7 +63,7 @@ def codeql_csharp_binary(name, **kwargs):
     pack_zip(
         name = name,
         srcs = [publish_binary_target],
-        prefix = "csharp/tools/" + codeql_platform,
+        prefix = language_prefix + "/tools/" + codeql_platform,
         strip_prefix = strip_prefix.files_only(),
         visibility = visibility,
     )