diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js
index f104d288c..38b6092fb 100644
--- a/lib/analyze-action-post.js
+++ b/lib/analyze-action-post.js
@@ -127156,7 +127156,8 @@ var featureConfig = {
   ["upload_overlay_db_to_api" /* UploadOverlayDbToApi */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
-    minimumVersion: void 0
+    minimumVersion: void 0,
+    toolsFeature: "bundleSupportsOverlay" /* BundleSupportsOverlay */
   },
   ["use_repository_properties" /* UseRepositoryProperties */]: {
     defaultValue: false,
diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index a798807fd..bea2ac913 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -94618,7 +94618,8 @@ var featureConfig = {
   ["upload_overlay_db_to_api" /* UploadOverlayDbToApi */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
-    minimumVersion: void 0
+    minimumVersion: void 0,
+    toolsFeature: "bundleSupportsOverlay" /* BundleSupportsOverlay */
   },
   ["use_repository_properties" /* UseRepositoryProperties */]: {
     defaultValue: false,
diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js
index d8ebda276..0009bda31 100644
--- a/lib/autobuild-action.js
+++ b/lib/autobuild-action.js
@@ -91016,7 +91016,8 @@ var featureConfig = {
   ["upload_overlay_db_to_api" /* UploadOverlayDbToApi */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
-    minimumVersion: void 0
+    minimumVersion: void 0,
+    toolsFeature: "bundleSupportsOverlay" /* BundleSupportsOverlay */
   },
   ["use_repository_properties" /* UseRepositoryProperties */]: {
     defaultValue: false,
diff --git a/lib/init-action-post.js b/lib/init-action-post.js
index 635b4baa0..38fc7a8af 100644
--- a/lib/init-action-post.js
+++ b/lib/init-action-post.js
@@ -130537,7 +130537,8 @@ var featureConfig = {
   ["upload_overlay_db_to_api" /* UploadOverlayDbToApi */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
-    minimumVersion: void 0
+    minimumVersion: void 0,
+    toolsFeature: "bundleSupportsOverlay" /* BundleSupportsOverlay */
   },
   ["use_repository_properties" /* UseRepositoryProperties */]: {
     defaultValue: false,
diff --git a/lib/init-action.js b/lib/init-action.js
index aaacdf2ef..e677aca79 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -92037,7 +92037,8 @@ var featureConfig = {
   ["upload_overlay_db_to_api" /* UploadOverlayDbToApi */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
-    minimumVersion: void 0
+    minimumVersion: void 0,
+    toolsFeature: "bundleSupportsOverlay" /* BundleSupportsOverlay */
   },
   ["use_repository_properties" /* UseRepositoryProperties */]: {
     defaultValue: false,
diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js
index 5bb73f184..fe35e1220 100644
--- a/lib/resolve-environment-action.js
+++ b/lib/resolve-environment-action.js
@@ -91007,7 +91007,8 @@ var featureConfig = {
   ["upload_overlay_db_to_api" /* UploadOverlayDbToApi */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
-    minimumVersion: void 0
+    minimumVersion: void 0,
+    toolsFeature: "bundleSupportsOverlay" /* BundleSupportsOverlay */
   },
   ["use_repository_properties" /* UseRepositoryProperties */]: {
     defaultValue: false,
diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js
index 5ca88a307..d8e744a00 100644
--- a/lib/setup-codeql-action.js
+++ b/lib/setup-codeql-action.js
@@ -90919,7 +90919,8 @@ var featureConfig = {
   ["upload_overlay_db_to_api" /* UploadOverlayDbToApi */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
-    minimumVersion: void 0
+    minimumVersion: void 0,
+    toolsFeature: "bundleSupportsOverlay" /* BundleSupportsOverlay */
   },
   ["use_repository_properties" /* UseRepositoryProperties */]: {
     defaultValue: false,
diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js
index 1a8cc2516..a47e8a6b4 100644
--- a/lib/start-proxy-action-post.js
+++ b/lib/start-proxy-action-post.js
@@ -126562,7 +126562,8 @@ var featureConfig = {
   ["upload_overlay_db_to_api" /* UploadOverlayDbToApi */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
-    minimumVersion: void 0
+    minimumVersion: void 0,
+    toolsFeature: "bundleSupportsOverlay" /* BundleSupportsOverlay */
   },
   ["use_repository_properties" /* UseRepositoryProperties */]: {
     defaultValue: false,
diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js
index 02af8a266..d64089c17 100644
--- a/lib/start-proxy-action.js
+++ b/lib/start-proxy-action.js
@@ -107835,7 +107835,8 @@ var featureConfig = {
   ["upload_overlay_db_to_api" /* UploadOverlayDbToApi */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
-    minimumVersion: void 0
+    minimumVersion: void 0,
+    toolsFeature: "bundleSupportsOverlay" /* BundleSupportsOverlay */
   },
   ["use_repository_properties" /* UseRepositoryProperties */]: {
     defaultValue: false,
diff --git a/lib/upload-lib.js b/lib/upload-lib.js
index 4f5980a25..8c3609e53 100644
--- a/lib/upload-lib.js
+++ b/lib/upload-lib.js
@@ -94072,7 +94072,8 @@ var featureConfig = {
   ["upload_overlay_db_to_api" /* UploadOverlayDbToApi */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
-    minimumVersion: void 0
+    minimumVersion: void 0,
+    toolsFeature: "bundleSupportsOverlay" /* BundleSupportsOverlay */
   },
   ["use_repository_properties" /* UseRepositoryProperties */]: {
     defaultValue: false,
diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js
index d627aeb11..bd5f22de8 100644
--- a/lib/upload-sarif-action-post.js
+++ b/lib/upload-sarif-action-post.js
@@ -126728,7 +126728,8 @@ var featureConfig = {
   ["upload_overlay_db_to_api" /* UploadOverlayDbToApi */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
-    minimumVersion: void 0
+    minimumVersion: void 0,
+    toolsFeature: "bundleSupportsOverlay" /* BundleSupportsOverlay */
   },
   ["use_repository_properties" /* UseRepositoryProperties */]: {
     defaultValue: false,
diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js
index d909f575e..411416e6d 100644
--- a/lib/upload-sarif-action.js
+++ b/lib/upload-sarif-action.js
@@ -93869,7 +93869,8 @@ var featureConfig = {
   ["upload_overlay_db_to_api" /* UploadOverlayDbToApi */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
-    minimumVersion: void 0
+    minimumVersion: void 0,
+    toolsFeature: "bundleSupportsOverlay" /* BundleSupportsOverlay */
   },
   ["use_repository_properties" /* UseRepositoryProperties */]: {
     defaultValue: false,
diff --git a/src/feature-flags.ts b/src/feature-flags.ts
index f524fda94..24e84f7c2 100644
--- a/src/feature-flags.ts
+++ b/src/feature-flags.ts
@@ -293,6 +293,7 @@ export const featureConfig: Record<
     defaultValue: false,
     envVar: "CODEQL_ACTION_UPLOAD_OVERLAY_DB_TO_API",
     minimumVersion: undefined,
+    toolsFeature: ToolsFeature.BundleSupportsOverlay,
   },
   [Feature.UseRepositoryProperties]: {
     defaultValue: false,
diff --git a/src/tools-features.ts b/src/tools-features.ts
index 01f9569c1..8d9258c84 100644
--- a/src/tools-features.ts
+++ b/src/tools-features.ts
@@ -4,6 +4,7 @@ import type { VersionInfo } from "./codeql";
 
 export enum ToolsFeature {
   BuiltinExtractorsSpecifyDefaultQueries = "builtinExtractorsSpecifyDefaultQueries",
+  BundleSupportsOverlay = "bundleSupportsOverlay",
   DatabaseInterpretResultsSupportsSarifRunProperty = "databaseInterpretResultsSupportsSarifRunProperty",
   ForceOverwrite = "forceOverwrite",
   IndirectTracingSupportsStaticBinaries = "indirectTracingSupportsStaticBinaries",