diff --git a/tasks/detect-stemcell-bump/concourseio/runner.go b/tasks/detect-stemcell-bump/concourseio/runner.go
index 93c1948e2..ec619e826 100644
--- a/tasks/detect-stemcell-bump/concourseio/runner.go
+++ b/tasks/detect-stemcell-bump/concourseio/runner.go
@@ -149,7 +149,7 @@ func buildSubDir(buildDir, subDir string) (string, error) {
 }
 
 func parseOSfromURL(url string) (string, error) {
-	versionRegex := regexp.MustCompile(`(ubuntu-.*)-go_agent.tgz`)
+	versionRegex := regexp.MustCompile(`(ubuntu-[a-z]+(?:-[a-z]+)*?)(?:-go_agent)?\.tgz`)
 
 	allMatches := versionRegex.FindAllStringSubmatch(url, 1)