diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 1ff976942..26015c397 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -98,10 +98,4 @@ jobs:
       run: ./ci/ci-script.bash
 
     - name: Upload coverage data to Codecov
-      uses: codecov/codecov-action@v4
-      with:
-        fail_ci_if_error: true
-        disable_search: true
-        files: ${{ github.workspace }}/nodist/obj_dir/coverage/app_total.info
-        token: ${{ secrets.CODECOV_TOKEN }}
-        verbose: true
+      run: ( cd nodist/obj_dir/upload && ../../../ci/codecov -v do-upload --fail-on-error -f ../../../nodist/obj_dir/coverage/app_total.info )
diff --git a/ci/codecov b/ci/codecov
new file mode 100755
index 000000000..e785caf64
Binary files /dev/null and b/ci/codecov differ
diff --git a/nodist/code_coverage b/nodist/code_coverage
index 0129331a1..5d2f6f126 100755
--- a/nodist/code_coverage
+++ b/nodist/code_coverage
@@ -180,7 +180,13 @@ def test():
     if Args.stage_enabled[18]:
         ci_fold_start("upload")
         print("Stage 18: Upload")
-        cmd = "codecov -v do-upload --disable-search -Z -f " + cc_dir + "/app_total.info"
+        # curl -Os https://cli.codecov.io/latest/linux/codecov ; sudo chmod +x codecov
+        # --disable-search does not seem to work, so we use a temp directory
+        upload_dir = "nodist/obj_dir/upload"
+        os.makedirs(upload_dir, exist_ok=True)
+        cmd = ("( cd " + upload_dir +
+               " && ../../../ci/codecov -v do-upload --fail-on-error" +
+               " -f ../../../" + cc_dir + "/app_total.info )")
         print("print: Not running: export CODECOV_TOKEN=<hidden>")
         print("print: Not running: " + cmd)
         ci_fold_end()
@@ -364,12 +370,13 @@ parser.add_argument('--scenarios',
                     help='pass test scenarios onto driver.pl test harness')
 parser.add_argument(
     '--stages',
+    '--stage',
     action='store',
     help='runs a specific stage or range of stages (see the script)')
 parser.add_argument(
+    '--tests',
     '--test',
     action='append',
-    dest='tests',
     default=[],
     help=
     'Instead of normal regressions, run the specified test(s), may be used multiple times'
diff --git a/test_regress/t/t_dist_copyright.pl b/test_regress/t/t_dist_copyright.pl
index 868d6dcf2..e235a8338 100755
--- a/test_regress/t/t_dist_copyright.pl
+++ b/test_regress/t/t_dist_copyright.pl
@@ -26,7 +26,7 @@ our @Exempt_Files_List = qw(
     README.rst
     ci/ci-win-compile.ps1
     ci/ci-win-test.ps1
-    ci/coverage-upload.sh
+    ci/codecov
     docs/CONTRIBUTING.rst
     docs/CONTRIBUTORS
     docs/README.rst