diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index 9a10663d4f..8272bc4a77 100644
--- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -628,7 +628,7 @@ func (b *builder) defaultSwarmDimensions(parts map[string]string) []string {
 			deviceInfo, ok := map[string][]string{
 				"AndroidOne":      {"sprout", "MOB30Q"},
 				"Chorizo":         {"chorizo", "1.30_109591"},
-				"GalaxyS6":        {"zerofltetmo", "NRD90M_G920TUVU5FQK1"},
+				"GalaxyS6":        {"zerofltetmo", "NRD90M_G920TUVS6FRC1"},
 				"GalaxyS7_G930FD": {"herolte", "R16NW_G930FXXS2ERH6"}, // This is Oreo.
 				"GalaxyS9":        {"starlte", "R16NW_G960FXXU2BRJ8"}, // This is Oreo.
 				"MotoG4":          {"athene", "NPJS25.93-14.7-8"},
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 6d4cb6c331..daa2bc4ffd 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -14812,7 +14812,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
+        "device_os:NRD90M_G920TUVS6FRC1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -14878,7 +14878,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
+        "device_os:NRD90M_G920TUVS6FRC1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -24395,7 +24395,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
+        "device_os:NRD90M_G920TUVS6FRC1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -24461,7 +24461,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
+        "device_os:NRD90M_G920TUVS6FRC1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -24527,7 +24527,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
+        "device_os:NRD90M_G920TUVS6FRC1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -24593,7 +24593,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
+        "device_os:NRD90M_G920TUVS6FRC1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"
@@ -24659,7 +24659,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:NRD90M_G920TUVU5FQK1",
+        "device_os:NRD90M_G920TUVS6FRC1",
         "device_type:zerofltetmo",
         "os:Android",
         "pool:Skia"