diff --git a/automation/taskcluster/androidTest/flank-x86.yml b/automation/taskcluster/androidTest/flank-x86.yml
index 04a3aa038..5ce00a925 100644
--- a/automation/taskcluster/androidTest/flank-x86.yml
+++ b/automation/taskcluster/androidTest/flank-x86.yml
@@ -13,7 +13,7 @@ gcloud:
   # will start test then leave socket open. reports will be published
   # to /results
   # see: https://github.com/TestArmada/flank/issues/339
-  async: false 
+  async: false
 
   # results-history-name
   # by default, set to app name
@@ -21,6 +21,10 @@ gcloud:
   # see: https://github.com/TestArmada/flank/issues/341
   #results-history-name: tmp_parallel 
 
+  # The number of times a TestExecution should be re-attempted if one or more\nof its test cases fail for any reason.
+  # The maximum number of reruns allowed is 10. Default is 0, which implies no reruns.
+  num-flaky-test-attempts: 3
+
   # test and app are the only required args
   app: /app/path 
   test: /test/path
@@ -34,7 +38,7 @@ gcloud:
   performance-metrics: true
 
   device:
-   - model: Nexus9 
+   - model: Nexus6 
      version: 25
    - model: Pixel2 
      version: 28
@@ -48,6 +52,3 @@ flank:
   # 1 runs the tests once. 10 runs all the tests 10x
   repeat-tests: 1
 
-  # The number of times a TestExecution should be re-attempted if one or more\nof its test cases fail for any reason.
-  # The maximum number of reruns allowed is 10. Default is 0, which implies no reruns.
-  num-flaky-test-attempts: 3