diff --git a/app/build.gradle b/app/build.gradle
index 640ba7a758..42316cbb9e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -424,7 +424,7 @@ task printBuildVariants {
 
 task printGeckoviewVersions {
     doLast {
-        println "nightly: " + groovy.json.JsonOutput.toJson(GeckoVersions.nightly_version)
+        println "beta: " + groovy.json.JsonOutput.toJson(GeckoVersions.beta_version)
     }
 }
 
diff --git a/automation/taskcluster/decision_task.py b/automation/taskcluster/decision_task.py
index b496e7d839..9d035f8cef 100644
--- a/automation/taskcluster/decision_task.py
+++ b/automation/taskcluster/decision_task.py
@@ -85,8 +85,8 @@ def raptor(is_staging):
     signing_tasks = {}
     other_tasks = {}
 
-    geckoview_nightly_version = get_geckoview_versions()['nightly']
-    mozharness_task_id = fetch_mozharness_task_id(geckoview_nightly_version)
+    geckoview_beta_version = get_geckoview_versions()['beta']
+    mozharness_task_id = fetch_mozharness_task_id(geckoview_beta_version)
     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 69b3fb5d15..8dcff6e654 100644
--- a/automation/taskcluster/lib/gradle.py
+++ b/automation/taskcluster/lib/gradle.py
@@ -29,7 +29,7 @@ def get_geckoview_versions():
     output = _run_gradle_process('printGeckoviewVersions')
 
     versions = {}
-    for version_type in ('nightly',):
+    for version_type in ('beta',):
         version = _extract_content_from_command_output(output, prefix='{}: '.format(version_type))
         version = version.strip('"')
         versions[version_type] = version
diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py
index 41780d318d..53ab1e8445 100644
--- a/automation/taskcluster/lib/tasks.py
+++ b/automation/taskcluster/lib/tasks.py
@@ -652,11 +652,11 @@ def schedule_task_graph(ordered_groups_of_tasks):
     return full_task_graph
 
 
-def fetch_mozharness_task_id(geckoview_nightly_version):
-    nightly_build_id = geckoview_nightly_version.split('.')[-1]
+def fetch_mozharness_task_id(geckoview_beta_version):
+    nightly_build_id = geckoview_beta_version.split('.')[-1]
     nightly_date = arrow.get(nightly_build_id, 'YYYYMMDDHHmmss')
 
-    raptor_index = 'gecko.v2.mozilla-central.pushdate.{}.{:02}.{:02}.{}.firefox.linux64-debug'.format(
+    raptor_index = 'gecko.v2.mozilla-beta.pushdate.{}.{:02}.{:02}.{}.firefox.linux64-debug'.format(
         nightly_date.year, nightly_date.month, nightly_date.day, nightly_build_id
     )
     return taskcluster.Index().findTask(raptor_index)['taskId']