diff --git a/test/ci_workflow_gen.go b/test/ci_workflow_gen.go
index f5a817c9a8c..048065a36af 100644
--- a/test/ci_workflow_gen.go
+++ b/test/ci_workflow_gen.go
@@ -162,6 +162,10 @@ type selfHostedTest struct {
 	MakeTools, InstallXtraBackup, Docker                        bool
 }
 
+func needsUbuntu20(clusterName string, mysqlVersion mysqlVersion) bool {
+	return mysqlVersion == mysql80 || strings.HasPrefix(clusterName, "vtgate") || strings.HasPrefix(clusterName, "tabletmanager")
+}
+
 // clusterMySQLVersions return list of mysql versions (one or more) that this cluster needs to test against
 func clusterMySQLVersions(clusterName string) mysqlVersions {
 	switch {
@@ -345,8 +349,10 @@ func generateClusterWorkflows(list []string, tpl string) {
 					break
 				}
 			}
-			if mysqlVersion == mysql80 {
+			if needsUbuntu20(cluster, mysqlVersion) {
 				test.Ubuntu20 = true
+			}
+			if mysqlVersion == mysql80 {
 				test.Platform = string(mysql80)
 			}
 			if strings.HasPrefix(cluster, "vreplication") || strings.HasSuffix(cluster, "heavy") {