diff --git a/automation/taskcluster/decision_task.py b/automation/taskcluster/decision_task.py
index 78e176a00e..00938736b1 100644
--- a/automation/taskcluster/decision_task.py
+++ b/automation/taskcluster/decision_task.py
@@ -15,7 +15,7 @@ import re
 
 import taskcluster
 
-from lib.gradle import get_variants_for_build_type, get_geckoview_versions
+from lib.gradle import get_variants_for_build_type
 from lib.tasks import (
     fetch_mozharness_task_id,
     schedule_task_graph,
@@ -85,8 +85,7 @@ def raptor(is_staging):
     signing_tasks = {}
     other_tasks = {}
 
-    geckoview_version = get_geckoview_versions()
-    mozharness_task_id = fetch_mozharness_task_id(geckoview_version)
+    mozharness_task_id = fetch_mozharness_task_id()
     gecko_revision = taskcluster.Queue().task(mozharness_task_id)['payload']['env']['GECKO_HEAD_REV']
 
     for variant in [Variant.from_values(abi, False, 'forPerformanceTest') for abi in ('aarch64', 'arm')]:
diff --git a/automation/taskcluster/lib/gradle.py b/automation/taskcluster/lib/gradle.py
index 0277f565ac..2df005108b 100644
--- a/automation/taskcluster/lib/gradle.py
+++ b/automation/taskcluster/lib/gradle.py
@@ -24,18 +24,6 @@ def get_variants_for_build_type(build_type):
             if variant_dict['buildType'] == build_type]
 
 
-def get_geckoview_versions():
-    print("Fetching geckoview version from gradle")
-    output = _run_gradle_process('printGeckoviewVersions')
-
-    version_type = 'release'
-    version = _extract_content_from_command_output(output, prefix='{}: '.format(version_type))
-    version = version.strip('"')
-    print('Got geckoview {} version: "{}"'.format(version_type, version))
-
-    return version
-
-
 def _run_gradle_process(gradle_command):
     process = subprocess.Popen(["./gradlew", "--no-daemon", "--quiet", gradle_command], stdout=subprocess.PIPE)
     output, err = process.communicate()
diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py
index 05361fe989..f8518cbf78 100644
--- a/automation/taskcluster/lib/tasks.py
+++ b/automation/taskcluster/lib/tasks.py
@@ -580,7 +580,7 @@ class TaskBuilder(object):
                         "test_packages_url": "{}/{}/artifacts/public/build/en-US/target.test_packages.json".format(_DEFAULT_TASK_URL, mozharness_task_id),
                         "installer_url": apk_url,
                     }),
-                    "GECKO_HEAD_REPOSITORY": "https://hg.mozilla.org/releases/mozilla-release",
+                    "GECKO_HEAD_REPOSITORY": "https://hg.mozilla.org/mozilla-central",
                     "GECKO_HEAD_REV": gecko_revision,
                     "MOZ_AUTOMATION": "1",
                     "MOZ_HIDE_RESULTS_TABLE": "1",
@@ -600,7 +600,7 @@ class TaskBuilder(object):
                 },
                 "mounts": [{
                     "content": {
-                        "url": "https://hg.mozilla.org/releases/mozilla-release/raw-file/{}/taskcluster/scripts/tester/test-linux.sh".format(gecko_revision),
+                        "url": "https://hg.mozilla.org/mozilla-central/raw-file/{}/taskcluster/scripts/tester/test-linux.sh".format(gecko_revision),
                     },
                     "file": "test-linux.sh",
                 }]
@@ -654,8 +654,7 @@ def schedule_task_graph(ordered_groups_of_tasks):
     return full_task_graph
 
 
-def fetch_mozharness_task_id(geckoview_beta_version):
-    raptor_index = 'gecko.v2.mozilla-release.geckoview-version.{}.mobile.android-x86_64-beta-opt'.format(
-        geckoview_beta_version
-    )
+def fetch_mozharness_task_id():
+    # We now want to use the latest available raptor
+    raptor_index = 'gecko.v2.mozilla-central.nightly.latest.mobile.android-x86_64-opt'
     return taskcluster.Index().findTask(raptor_index)['taskId']