diff --git a/change-notes/1.24/extractor-go.md b/change-notes/1.24/extractor-go.md
index 689ba0b4390..b7ae7ac1e25 100644
--- a/change-notes/1.24/extractor-go.md
+++ b/change-notes/1.24/extractor-go.md
@@ -4,7 +4,8 @@
 
 ## Changes to code extraction
 
-* The autobuilder now runs Makefiles or custom build scripts present in the codebase to install dependencies.
+* The autobuilder now runs Makefiles or custom build scripts present in the codebase to install dependencies. The build command
+  to invoke can be configured via `lgtm.yml`, or by setting the environment variable `CODEQL_EXTRACTOR_GO_BUILD_COMMAND`.
 * The autobuilder now attempts to automatically detect when dependencies have been vendored and use `-mod=vendor` appropriately.
 * The extractor now supports extracting go.mod files, enabling queries on dependencies and their versions.
 * The extractor now supports Go 1.14.
diff --git a/extractor/cli/go-autobuilder/go-autobuilder.go b/extractor/cli/go-autobuilder/go-autobuilder.go
index 0bdaf5770c0..c87c4536a0c 100644
--- a/extractor/cli/go-autobuilder/go-autobuilder.go
+++ b/extractor/cli/go-autobuilder/go-autobuilder.go
@@ -28,10 +28,10 @@ source files into a folder corresponding to the package's import path before ins
 dependencies.
 
 This behavior can be further customized using environment variables: setting LGTM_INDEX_NEED_GOPATH
-to 'false' disables the GOPATH set-up, LGTM_INDEX_BUILD_COMMAND can be set to a newline-separated
-list of commands to run in order to install dependencies, and LGTM_INDEX_IMPORT_PATH can be used to
-override the package import path, which is otherwise inferred from the SEMMLE_REPO_URL environment
-variable.
+to 'false' disables the GOPATH set-up, CODEQL_EXTRACTOR_GO_BUILD_COMMAND (or alternatively
+LGTM_INDEX_BUILD_COMMAND), can be set to a newline-separated list of commands to run in order to
+install dependencies, and LGTM_INDEX_IMPORT_PATH can be used to override the package import path,
+which is otherwise inferred from the SEMMLE_REPO_URL environment variable.
 `,
 		os.Args[0])
 	fmt.Fprintf(os.Stderr, "Usage:\n\n  %s\n", os.Args[0])
@@ -276,7 +276,10 @@ func main() {
 	}
 
 	// check whether an explicit dependency installation command was provided
-	inst := os.Getenv("LGTM_INDEX_BUILD_COMMAND")
+	inst := os.Getenv("CODEQL_EXTRACTOR_GO_BUILD_COMMAND")
+	if inst == "" {
+		inst = os.Getenv("LGTM_INDEX_BUILD_COMMAND")
+	}
 	var install *exec.Cmd
 	if inst == "" {
 		// if there is a build file, run the corresponding build tool