diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 40d9b60f..a7852877 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -20,6 +20,9 @@ jobs:
           fetch-depth: 0
           submodules: recursive
 
+      - name: Ensure submodules point to commit from main branch
+        run: git submodule foreach --recursive "git merge-base --is-ancestor HEAD origin/main"
+
       - name: create checksum file
         uses: hypertrace/github-actions/checksum@main
 
@@ -72,7 +75,7 @@ jobs:
       - name: Setup snyk
         uses: snyk/actions/setup@0.3.0
       - name: Snyk test
-        run: snyk test --all-sub-projects --org=hypertrace --severity-threshold=low --policy-path=.snyk
+        run: snyk test --all-sub-projects --org=hypertrace --severity-threshold=low --policy-path=.snyk --remote-repo-url='${{ github.server_url }}/${{ github.repository }}.git'
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
           GRADLE_OPTS: -Dorg.gradle.workers.max=1 # Snyk doesn't handle parallelism
diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index acf2e3c0..90bfb55b 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -35,10 +35,9 @@ jobs:
           args: jacocoTestReport
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2
         with:
           name: unit test reports
-          fail_ci_if_error: true
           flags: unit
   
       - name: copy test reports
diff --git a/hypertrace-core-graphql b/hypertrace-core-graphql
index 29f5405d..f50dca87 160000
--- a/hypertrace-core-graphql
+++ b/hypertrace-core-graphql
@@ -1 +1 @@
-Subproject commit 29f5405da5082cc9490562ce3fbffc0210f4d8ab
+Subproject commit f50dca87ddc6f4340436c2156ccbe08231274b47