diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 10c74b8d9..d63f92ad2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -70,7 +70,7 @@ jobs:
           "@
           New-item -Name .env -Value $env_contents -ItemType File -Force
           Write-Host "Running report for most recent Beta on Windows"
-          Write-Host "$env:TESTRAIL_USERNAME"
+          Write-Host "$env:TESTRAIL_REPORT"
       - name: Select Test Set
         if: ${{ inputs.test_set != null }}
         run: |
diff --git a/conftest.py b/conftest.py
index 48c02472f..e56624d9b 100644
--- a/conftest.py
+++ b/conftest.py
@@ -504,7 +504,13 @@ def driver(
         WebDriverWait(driver, timeout=40).until(
             EC.presence_of_element_located((By.TAG_NAME, "body"))
         )
-        json_metadata["fx_version"] = _get_version(driver)
+        displayed_version = _get_version(driver).split(" ")[0]
+        if displayed_version not in version:
+            raise ValueError(
+                f"Mismatch between displayed version {displayed_version}"
+                f" and actual version {version}"
+            )
+        json_metadata["fx_version"] = version
         json_metadata["machine_config"] = machine_config
         json_metadata["suite_id"] = suite_id
         json_metadata["test_case"] = test_case
diff --git a/taskcluster/kinds/new-beta-qa/kind.yml b/taskcluster/kinds/new-beta-qa/kind.yml
index 9692cbd45..e3856fd60 100644
--- a/taskcluster/kinds/new-beta-qa/kind.yml
+++ b/taskcluster/kinds/new-beta-qa/kind.yml
@@ -15,6 +15,7 @@ task-defaults:
         type: directory
     env:
       TESTRAIL_REPORT: "true"
+      STARFOX_MANIFEST: "./manifests/smoke.yaml"
   routes:
     - notify.slack-channel.C07AHPJ525V.on-resolved
   scopes:
diff --git a/taskcluster/kinds/new-devedition-qa/kind.yml b/taskcluster/kinds/new-devedition-qa/kind.yml
index e82b3f9dc..2b282e867 100644
--- a/taskcluster/kinds/new-devedition-qa/kind.yml
+++ b/taskcluster/kinds/new-devedition-qa/kind.yml
@@ -15,6 +15,7 @@ task-defaults:
         type: directory
     env:
       TESTRAIL_REPORT: "true"
+      STARFOX_MANIFEST: "./manifests/smoke.yaml"
   routes:
     - notify.slack-channel.C07AHPJ525V.on-resolved
   scopes: