diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index 7746a12f2..3fcae5133 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -90122,6 +90122,10 @@ function isSupportedToolsFeature(versionInfo, feature) {
 var DEFAULT_VERSION_FEATURE_FLAG_PREFIX = "default_codeql_version_";
 var DEFAULT_VERSION_FEATURE_FLAG_SUFFIX = "_enabled";
 var CODEQL_VERSION_ZSTD_BUNDLE = "2.19.0";
+var LINKED_CODEQL_VERSION = {
+  cliVersion,
+  tagName: bundleVersion
+};
 var featureConfig = {
   ["allow_toolcache_input" /* AllowToolcacheInput */]: {
     defaultValue: false,
@@ -90348,12 +90352,7 @@ var OfflineFeatures = class {
   logger;
   async getEnabledDefaultCliVersions(_variant) {
     return {
-      enabledVersions: [
-        {
-          cliVersion,
-          tagName: bundleVersion
-        }
-      ]
+      enabledVersions: [LINKED_CODEQL_VERSION]
     };
   }
   /**
@@ -90536,12 +90535,7 @@ var GitHubFeatureFlags = class {
         `Feature flags do not specify a default CLI version. Falling back to the CLI version shipped with the Action. This is ${cliVersion}.`
       );
       const result = {
-        enabledVersions: [
-          {
-            cliVersion,
-            tagName: bundleVersion
-          }
-        ]
+        enabledVersions: [LINKED_CODEQL_VERSION]
       };
       if (this.hasAccessedRemoteFeatureFlags) {
         result.toolsFeatureFlagsValid = false;
diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js
index 7515699f2..e03e79d14 100644
--- a/lib/autobuild-action.js
+++ b/lib/autobuild-action.js
@@ -86538,6 +86538,10 @@ function isSupportedToolsFeature(versionInfo, feature) {
 // src/feature-flags.ts
 var DEFAULT_VERSION_FEATURE_FLAG_PREFIX = "default_codeql_version_";
 var DEFAULT_VERSION_FEATURE_FLAG_SUFFIX = "_enabled";
+var LINKED_CODEQL_VERSION = {
+  cliVersion,
+  tagName: bundleVersion
+};
 var featureConfig = {
   ["allow_toolcache_input" /* AllowToolcacheInput */]: {
     defaultValue: false,
@@ -86764,12 +86768,7 @@ var OfflineFeatures = class {
   logger;
   async getEnabledDefaultCliVersions(_variant) {
     return {
-      enabledVersions: [
-        {
-          cliVersion,
-          tagName: bundleVersion
-        }
-      ]
+      enabledVersions: [LINKED_CODEQL_VERSION]
     };
   }
   /**
@@ -86952,12 +86951,7 @@ var GitHubFeatureFlags = class {
         `Feature flags do not specify a default CLI version. Falling back to the CLI version shipped with the Action. This is ${cliVersion}.`
       );
       const result = {
-        enabledVersions: [
-          {
-            cliVersion,
-            tagName: bundleVersion
-          }
-        ]
+        enabledVersions: [LINKED_CODEQL_VERSION]
       };
       if (this.hasAccessedRemoteFeatureFlags) {
         result.toolsFeatureFlagsValid = false;
diff --git a/lib/init-action-post.js b/lib/init-action-post.js
index ad2b0a737..85e878ac9 100644
--- a/lib/init-action-post.js
+++ b/lib/init-action-post.js
@@ -131299,6 +131299,10 @@ function isSafeArtifactUpload(codeQlVersion) {
 var DEFAULT_VERSION_FEATURE_FLAG_PREFIX = "default_codeql_version_";
 var DEFAULT_VERSION_FEATURE_FLAG_SUFFIX = "_enabled";
 var CODEQL_VERSION_ZSTD_BUNDLE = "2.19.0";
+var LINKED_CODEQL_VERSION = {
+  cliVersion,
+  tagName: bundleVersion
+};
 var featureConfig = {
   ["allow_toolcache_input" /* AllowToolcacheInput */]: {
     defaultValue: false,
@@ -131525,12 +131529,7 @@ var OfflineFeatures = class {
   logger;
   async getEnabledDefaultCliVersions(_variant) {
     return {
-      enabledVersions: [
-        {
-          cliVersion,
-          tagName: bundleVersion
-        }
-      ]
+      enabledVersions: [LINKED_CODEQL_VERSION]
     };
   }
   /**
@@ -131713,12 +131712,7 @@ var GitHubFeatureFlags = class {
         `Feature flags do not specify a default CLI version. Falling back to the CLI version shipped with the Action. This is ${cliVersion}.`
       );
       const result = {
-        enabledVersions: [
-          {
-            cliVersion,
-            tagName: bundleVersion
-          }
-        ]
+        enabledVersions: [LINKED_CODEQL_VERSION]
       };
       if (this.hasAccessedRemoteFeatureFlags) {
         result.toolsFeatureFlagsValid = false;
diff --git a/lib/init-action.js b/lib/init-action.js
index 4bc423b6b..0eaa4ed11 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -87655,6 +87655,10 @@ function isSupportedToolsFeature(versionInfo, feature) {
 var DEFAULT_VERSION_FEATURE_FLAG_PREFIX = "default_codeql_version_";
 var DEFAULT_VERSION_FEATURE_FLAG_SUFFIX = "_enabled";
 var CODEQL_VERSION_ZSTD_BUNDLE = "2.19.0";
+var LINKED_CODEQL_VERSION = {
+  cliVersion,
+  tagName: bundleVersion
+};
 var featureConfig = {
   ["allow_toolcache_input" /* AllowToolcacheInput */]: {
     defaultValue: false,
@@ -87881,12 +87885,7 @@ var OfflineFeatures = class {
   logger;
   async getEnabledDefaultCliVersions(_variant) {
     return {
-      enabledVersions: [
-        {
-          cliVersion,
-          tagName: bundleVersion
-        }
-      ]
+      enabledVersions: [LINKED_CODEQL_VERSION]
     };
   }
   /**
@@ -88069,12 +88068,7 @@ var GitHubFeatureFlags = class {
         `Feature flags do not specify a default CLI version. Falling back to the CLI version shipped with the Action. This is ${cliVersion}.`
       );
       const result = {
-        enabledVersions: [
-          {
-            cliVersion,
-            tagName: bundleVersion
-          }
-        ]
+        enabledVersions: [LINKED_CODEQL_VERSION]
       };
       if (this.hasAccessedRemoteFeatureFlags) {
         result.toolsFeatureFlagsValid = false;
diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js
index 57b2835b2..29896e043 100644
--- a/lib/setup-codeql-action.js
+++ b/lib/setup-codeql-action.js
@@ -86443,6 +86443,10 @@ function isSupportedToolsFeature(versionInfo, feature) {
 var DEFAULT_VERSION_FEATURE_FLAG_PREFIX = "default_codeql_version_";
 var DEFAULT_VERSION_FEATURE_FLAG_SUFFIX = "_enabled";
 var CODEQL_VERSION_ZSTD_BUNDLE = "2.19.0";
+var LINKED_CODEQL_VERSION = {
+  cliVersion,
+  tagName: bundleVersion
+};
 var featureConfig = {
   ["allow_toolcache_input" /* AllowToolcacheInput */]: {
     defaultValue: false,
@@ -86669,12 +86673,7 @@ var OfflineFeatures = class {
   logger;
   async getEnabledDefaultCliVersions(_variant) {
     return {
-      enabledVersions: [
-        {
-          cliVersion,
-          tagName: bundleVersion
-        }
-      ]
+      enabledVersions: [LINKED_CODEQL_VERSION]
     };
   }
   /**
@@ -86857,12 +86856,7 @@ var GitHubFeatureFlags = class {
         `Feature flags do not specify a default CLI version. Falling back to the CLI version shipped with the Action. This is ${cliVersion}.`
       );
       const result = {
-        enabledVersions: [
-          {
-            cliVersion,
-            tagName: bundleVersion
-          }
-        ]
+        enabledVersions: [LINKED_CODEQL_VERSION]
       };
       if (this.hasAccessedRemoteFeatureFlags) {
         result.toolsFeatureFlagsValid = false;
diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js
index eef3a477a..ee67ed723 100644
--- a/lib/start-proxy-action.js
+++ b/lib/start-proxy-action.js
@@ -103177,6 +103177,10 @@ var semver3 = __toESM(require_semver2());
 // src/feature-flags.ts
 var DEFAULT_VERSION_FEATURE_FLAG_PREFIX = "default_codeql_version_";
 var DEFAULT_VERSION_FEATURE_FLAG_SUFFIX = "_enabled";
+var LINKED_CODEQL_VERSION = {
+  cliVersion,
+  tagName: bundleVersion
+};
 var featureConfig = {
   ["allow_toolcache_input" /* AllowToolcacheInput */]: {
     defaultValue: false,
@@ -103403,12 +103407,7 @@ var OfflineFeatures = class {
   logger;
   async getEnabledDefaultCliVersions(_variant) {
     return {
-      enabledVersions: [
-        {
-          cliVersion,
-          tagName: bundleVersion
-        }
-      ]
+      enabledVersions: [LINKED_CODEQL_VERSION]
     };
   }
   /**
@@ -103591,12 +103590,7 @@ var GitHubFeatureFlags = class {
         `Feature flags do not specify a default CLI version. Falling back to the CLI version shipped with the Action. This is ${cliVersion}.`
       );
       const result = {
-        enabledVersions: [
-          {
-            cliVersion,
-            tagName: bundleVersion
-          }
-        ]
+        enabledVersions: [LINKED_CODEQL_VERSION]
       };
       if (this.hasAccessedRemoteFeatureFlags) {
         result.toolsFeatureFlagsValid = false;
diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js
index 7c87d8062..f644db648 100644
--- a/lib/upload-sarif-action.js
+++ b/lib/upload-sarif-action.js
@@ -89408,6 +89408,10 @@ function isSupportedToolsFeature(versionInfo, feature) {
 var DEFAULT_VERSION_FEATURE_FLAG_PREFIX = "default_codeql_version_";
 var DEFAULT_VERSION_FEATURE_FLAG_SUFFIX = "_enabled";
 var CODEQL_VERSION_ZSTD_BUNDLE = "2.19.0";
+var LINKED_CODEQL_VERSION = {
+  cliVersion,
+  tagName: bundleVersion
+};
 var featureConfig = {
   ["allow_toolcache_input" /* AllowToolcacheInput */]: {
     defaultValue: false,
@@ -89634,12 +89638,7 @@ var OfflineFeatures = class {
   logger;
   async getEnabledDefaultCliVersions(_variant) {
     return {
-      enabledVersions: [
-        {
-          cliVersion,
-          tagName: bundleVersion
-        }
-      ]
+      enabledVersions: [LINKED_CODEQL_VERSION]
     };
   }
   /**
@@ -89822,12 +89821,7 @@ var GitHubFeatureFlags = class {
         `Feature flags do not specify a default CLI version. Falling back to the CLI version shipped with the Action. This is ${cliVersion}.`
       );
       const result = {
-        enabledVersions: [
-          {
-            cliVersion,
-            tagName: bundleVersion
-          }
-        ]
+        enabledVersions: [LINKED_CODEQL_VERSION]
       };
       if (this.hasAccessedRemoteFeatureFlags) {
         result.toolsFeatureFlagsValid = false;
diff --git a/src/feature-flags.ts b/src/feature-flags.ts
index 84253cfa6..e31f8bea7 100644
--- a/src/feature-flags.ts
+++ b/src/feature-flags.ts
@@ -29,6 +29,11 @@ const DEFAULT_VERSION_FEATURE_FLAG_SUFFIX = "_enabled";
  */
 export const CODEQL_VERSION_ZSTD_BUNDLE = "2.19.0";
 
+const LINKED_CODEQL_VERSION: CodeQLVersionInfo = {
+  cliVersion: defaults.cliVersion,
+  tagName: defaults.bundleVersion,
+};
+
 export interface CodeQLVersionInfo {
   /** The version number of the CodeQL CLI, e.g. `2.19.0`. */
   cliVersion: string;
@@ -420,12 +425,7 @@ class OfflineFeatures implements FeatureEnablement {
     _variant: util.GitHubVariant,
   ): Promise<CodeQLDefaultVersionInfo> {
     return {
-      enabledVersions: [
-        {
-          cliVersion: defaults.cliVersion,
-          tagName: defaults.bundleVersion,
-        },
-      ],
+      enabledVersions: [LINKED_CODEQL_VERSION],
     };
   }
 
@@ -680,12 +680,7 @@ class GitHubFeatureFlags {
           `shipped with the Action. This is ${defaults.cliVersion}.`,
       );
       const result: CodeQLDefaultVersionInfo = {
-        enabledVersions: [
-          {
-            cliVersion: defaults.cliVersion,
-            tagName: defaults.bundleVersion,
-          },
-        ],
+        enabledVersions: [LINKED_CODEQL_VERSION],
       };
       if (this.hasAccessedRemoteFeatureFlags) {
         result.toolsFeatureFlagsValid = false;