diff --git a/.github/actions/action_tests/action.yaml b/.github/actions/action_tests/action.yaml
index e7e292c2d..002303b42 100644
--- a/.github/actions/action_tests/action.yaml
+++ b/.github/actions/action_tests/action.yaml
@@ -69,6 +69,7 @@ runs:
         junit-paths: junit.xml
         org-slug: trunk
         token: ${{ inputs.trunk-prod-token }}
+        variant: ${{ runner.os }}
       continue-on-error: true
       env:
         TRUNK_PUBLIC_API_ADDRESS: https://api.trunk.io
@@ -76,7 +77,7 @@ runs:
     - name: Upload staging results
       # TODO(Tyler): Add upload on Windows once the action supports it.
       if: "!cancelled() && runner.os != 'Windows' && inputs.trunk-staging-token != ''"
-      uses: trunk-io/analytics-uploader@gabe/surface-variant
+      uses: trunk-io/analytics-uploader@main
       with:
         junit-paths: junit.xml
         org-slug: trunk-staging-org
diff --git a/.github/actions/linter_tests/action.yaml b/.github/actions/linter_tests/action.yaml
index 853af074a..e32fbbb53 100644
--- a/.github/actions/linter_tests/action.yaml
+++ b/.github/actions/linter_tests/action.yaml
@@ -123,6 +123,7 @@ runs:
         junit-paths: junit.xml
         org-slug: trunk
         token: ${{ inputs.trunk-prod-token }}
+        variant: ${{ runner.os }}
       continue-on-error: true
       env:
         TRUNK_PUBLIC_API_ADDRESS: https://api.trunk.io
@@ -130,7 +131,7 @@ runs:
     - name: Upload staging results
       # TODO(Tyler): Add upload on Windows once the action supports it.
       if: "!cancelled() && runner.os != 'Windows' && inputs.trunk-staging-token != ''"
-      uses: trunk-io/analytics-uploader@gabe/surface-variant
+      uses: trunk-io/analytics-uploader@main
       with:
         junit-paths: junit.xml
         org-slug: trunk-staging-org
diff --git a/.github/actions/tool_tests/action.yaml b/.github/actions/tool_tests/action.yaml
index 94673996c..03c4e92d2 100644
--- a/.github/actions/tool_tests/action.yaml
+++ b/.github/actions/tool_tests/action.yaml
@@ -86,6 +86,7 @@ runs:
         junit-paths: junit.xml
         org-slug: trunk
         token: ${{ inputs.trunk-prod-token }}
+        variant: ${{ runner.os }}
       continue-on-error: true
       env:
         TRUNK_PUBLIC_API_ADDRESS: https://api.trunk.io
@@ -93,7 +94,7 @@ runs:
     - name: Upload staging results
       # TODO(Tyler): Add upload on Windows once the action supports it.
       if: "!cancelled() && runner.os != 'Windows' && inputs.trunk-staging-token != ''"
-      uses: trunk-io/analytics-uploader@gabe/surface-variant
+      uses: trunk-io/analytics-uploader@main
       with:
         junit-paths: junit.xml
         org-slug: trunk-staging-org