diff --git a/internal/ci/ci_tool.cue b/internal/ci/ci_tool.cue
index 5f8c4b624..da45ba2ca 100644
--- a/internal/ci/ci_tool.cue
+++ b/internal/ci/ci_tool.cue
@@ -19,6 +19,7 @@ import (
 	"encoding/yaml"
 	"tool/file"
 
+	"cuelang.org/go/internal/ci/base"
 	"cuelang.org/go/internal/ci/repo"
 	"cuelang.org/go/internal/ci/github"
 )
@@ -43,7 +44,7 @@ command: gen: {
 	workflows: {
 		remove: {
 			glob: file.Glob & {
-				glob: path.Join([_dir, "*.yml"], _goos)
+				glob: path.Join([_dir, "*" + base.workflowFileExtension], _goos)
 				files: [...string]
 			}
 			for _, _filename in glob.files {
diff --git a/internal/ci/github/workflows.cue b/internal/ci/github/workflows.cue
index 0b0c49feb..b9ddc1643 100644
--- a/internal/ci/github/workflows.cue
+++ b/internal/ci/github/workflows.cue
@@ -15,7 +15,7 @@
 // package github declares the workflows for this project.
 package github
 
-// Note: the name of the workflows (and hence the corresponding .yml filenames)
+// Note: the name of the workflows (and hence the corresponding .yaml filenames)
 // correspond to the environment variable names for gerritstatusupdater.
 // Therefore, this filename must only be change in combination with also
 // updating the environment in which gerritstatusupdater is running for this