diff --git a/l10n-screenshots-config.yml b/l10n-screenshots-config.yml
index 344633e70ce58..4cb6da052f796 100644
--- a/l10n-screenshots-config.yml
+++ b/l10n-screenshots-config.yml
@@ -4,92 +4,6 @@ locales:
     - anp
     - ar
     - ast
-    - az
-    - bg
-    - bn
-    - bo
-    - br
-    - bs
-    - ca
-    - co
-    - cs
-    - cy
-    - da
-    - de
-    - dsb
-    - el
-    - en-CA
-    - en-GB
-    - en-US
-    - eo
-    - es-AR
-    - es-CL
-    - es-MX
-    - es
-    - eu
-    - fa
-    - fi
-    - fr
-    - ga-IE
-    - gd
-    - gl
-    - gu-IN
-    - he
     - hi-IN
-    - hr
-    - hsb
-    - hu
-    - hy-AM
-    - ia
-    - id
-    - is
-    - it
-    - ja
-    - jv
-    - ka
-    - kab
-    - kk
-    - km
-    - kn
-    - ko
-    - lo
-    - lt
-    - lv
-    - ml
-    - mr
-    - ms
-    - my
-    - nb-NO
-    - ne-NP
-    - nl
-    - nn-NO
-    - oc
-    - or
-    - pa-IN
-    - pl
-    - pt-BR
-    - pt-PT
-    - rm
-    - ro
-    - ru
-    - ses
-    - si
-    - sk
-    - sl
-    - sq
-    - su
-    - sv-SE
-    - ta
-    - te
-    - th
-    - tl
-    - tr
-    - uk
-    - ur
-    - uz
-    - vi
-    - zgh
-    - zh-CN
-    - zh-TW
-locales-with-shorter-context-menu: ["hi-IN", "th", "zh-CN", "zh-TW"]  # These locales have 1 less screenshot. 
+locales-with-shorter-context-menu: ["hi-IN", "th", "zh-CN", "zh-TW"]  # These locales have 1 less screenshot.
 usual-number-of-screenshots: 55
diff --git a/taskcluster/ffios_taskgraph/transforms/bitrise.py b/taskcluster/ffios_taskgraph/transforms/bitrise.py
index 4fe154d963070..163f7ed183efa 100644
--- a/taskcluster/ffios_taskgraph/transforms/bitrise.py
+++ b/taskcluster/ffios_taskgraph/transforms/bitrise.py
@@ -20,26 +20,13 @@ def set_run_config(config, tasks):
         run.setdefault("using", "run-commands")
         run.setdefault("use-caches", False)
 
-        run["secrets"] = {
-            "by-level": {
-                "3": [{
-                    "name": "project/mobile/firefox-ios/bitrise",
-                    "key": "api_key",
-                    "path": ".bitrise_token",
-                }],
-                "default": [],
-            },
-        }
-
-        run["dummy-secrets"] = {
-            "by-level": {
-                "3": [],
-                "default": [{
-                    "content": "faketoken",
-                    "path": ".bitrise_token",
-                }],
-            },
-        }
+        run["secrets"] = [{
+            "name": "project/mobile/firefox-ios/bitrise",
+            "key": "api_key",
+            "path": ".bitrise_token",
+        }]
+
+        run["dummy-secrets"] = []
 
         yield task
 
diff --git a/taskcluster/scripts/check-screenshots.py b/taskcluster/scripts/check-screenshots.py
index 4a911bb9ff8d8..f5fa1bcb52795 100755
--- a/taskcluster/scripts/check-screenshots.py
+++ b/taskcluster/scripts/check-screenshots.py
@@ -84,8 +84,7 @@ def _check_files(artifacts_directory, locales, number_of_screenshots_per_locale)
     if errors:
         error_list = "\n * ".join(errors)
         log.critical("Got {} error(s) while verifying screenshots: \n * {}".format(len(errors), error_list))
-        # TODO Uncomment the next line once screenshot tests are fixed on all locales.
-        # sys.exit(_FAILURE_EXIT_CODE)
+        sys.exit(_FAILURE_EXIT_CODE)
 
     log.info("No archive is missing and all of them contain the right number of screenshots!")
 
diff --git a/try_task_config.json b/try_task_config.json
new file mode 100644
index 0000000000000..5a334d35d071a
--- /dev/null
+++ b/try_task_config.json
@@ -0,0 +1,7 @@
+{
+    "parameters": {
+        "optimize_target_tasks": true,
+        "target_tasks_method": "l10n_screenshots"
+    },
+    "version": 2
+}