diff --git a/lib/entry-points.js b/lib/entry-points.js
index 5b5328e88..9c9faffc6 100644
--- a/lib/entry-points.js
+++ b/lib/entry-points.js
@@ -177331,7 +177331,9 @@ async function getCodeQLForCmd(logger2, cmd, checkVersion, env = getEnv()) {
           ])
         );
       }
-      await new toolrunner3.ToolRunner(cmd, args).exec();
+      await new toolrunner3.ToolRunner(cmd, args, {
+        env: env.getDefined()
+      }).exec();
     },
     async databaseExportDiagnostics(databasePath, sarifFile, automationDetailsId) {
       const args = [
@@ -177350,7 +177352,9 @@ async function getCodeQLForCmd(logger2, cmd, checkVersion, env = getEnv()) {
       if (automationDetailsId !== void 0) {
         args.push("--sarif-category", automationDetailsId);
       }
-      await new toolrunner3.ToolRunner(cmd, args).exec();
+      await new toolrunner3.ToolRunner(cmd, args, {
+        env: env.getDefined()
+      }).exec();
     },
     async diagnosticsExport(sarifFile, automationDetailsId, config, diagnosticDir) {
       let configPath = getGeneratedCodeScanningConfigPath(config);
@@ -177377,7 +177381,9 @@ async function getCodeQLForCmd(logger2, cmd, checkVersion, env = getEnv()) {
       if (automationDetailsId !== void 0) {
         args.push("--sarif-category", automationDetailsId);
       }
-      await new toolrunner3.ToolRunner(cmd, args).exec();
+      await new toolrunner3.ToolRunner(cmd, args, {
+        env: env.getDefined()
+      }).exec();
     },
     async resolveExtractor(language) {
       let extractorPath = "";
@@ -177393,6 +177399,7 @@ async function getCodeQLForCmd(logger2, cmd, checkVersion, env = getEnv()) {
           ...getExtraOptionsFromEnv(["resolve", "extractor"])
         ],
         {
+          env: env.getDefined(),
           silent: true,
           listeners: {
             stdout: (data) => {
diff --git a/src/codeql.ts b/src/codeql.ts
index 9f7b4b5b8..ba004dde1 100644
--- a/src/codeql.ts
+++ b/src/codeql.ts
@@ -887,7 +887,9 @@ export async function getCodeQLForCmd(
           ]),
         );
       }
-      await new toolrunner.ToolRunner(cmd, args).exec();
+      await new toolrunner.ToolRunner(cmd, args, {
+        env: env.getDefined(),
+      }).exec();
     },
     async databaseExportDiagnostics(
       databasePath: string,
@@ -908,7 +910,9 @@ export async function getCodeQLForCmd(
       if (automationDetailsId !== undefined) {
         args.push("--sarif-category", automationDetailsId);
       }
-      await new toolrunner.ToolRunner(cmd, args).exec();
+      await new toolrunner.ToolRunner(cmd, args, {
+        env: env.getDefined(),
+      }).exec();
     },
     async diagnosticsExport(
       sarifFile: string,
@@ -956,7 +960,9 @@ export async function getCodeQLForCmd(
       if (automationDetailsId !== undefined) {
         args.push("--sarif-category", automationDetailsId);
       }
-      await new toolrunner.ToolRunner(cmd, args).exec();
+      await new toolrunner.ToolRunner(cmd, args, {
+        env: env.getDefined(),
+      }).exec();
     },
     async resolveExtractor(language: Language): Promise<string> {
       // Request it using `format=json` so we don't need to strip the trailing new line generated by
@@ -974,6 +980,7 @@ export async function getCodeQLForCmd(
           ...getExtraOptionsFromEnv(["resolve", "extractor"]),
         ],
         {
+          env: env.getDefined(),
           silent: true,
           listeners: {
             stdout: (data) => {