diff --git a/.cirrus.yml b/.cirrus.yml
index 2c851a97..edb050f9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -106,7 +106,10 @@ task:
   << : *BUILD_INSTALL_TEST_TEMPLATE
   coverage_script:
     - for f in tcl/*.tcl; do script/nglfar2ccov $f; done
-    - bash <(curl -s https://codecov.io/bash)
+    - gcov -o lib envmodules
+    - curl -Os https://uploader.codecov.io/latest/macos/codecov
+    - chmod +x codecov
+    - ./codecov -t ${CODECOV_TOKEN}
   << : *ARTIFACTS_TEMPLATE
 
 task:
diff --git a/.github/workflows/linux_tests.yaml b/.github/workflows/linux_tests.yaml
index 8a63be8e..d0c30d5d 100644
--- a/.github/workflows/linux_tests.yaml
+++ b/.github/workflows/linux_tests.yaml
@@ -46,10 +46,11 @@ jobs:
           for f in tcl/*.tcl; do
             script/nglfar2ccov $f
           done
+          gcov -o lib envmodules
       - name: Uninstall Modules
         run: |
           make uninstall
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v2
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -97,10 +98,11 @@ jobs:
           for f in tcl/*.tcl; do
             script/nglfar2ccov $f
           done
+          gcov -o lib envmodules
       - name: Uninstall Modules
         run: |
           make uninstall
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v2
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -148,10 +150,11 @@ jobs:
           for f in tcl/*.tcl; do
             script/nglfar2ccov $f
           done
+          gcov -o lib envmodules
       - name: Uninstall Modules
         run: |
           make uninstall
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v2
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -203,10 +206,11 @@ jobs:
           for f in tcl/*.tcl; do
             script/nglfar2ccov $f
           done
+          gcov -o lib envmodules
       - name: Uninstall Modules
         run: |
           make uninstall
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v2
       - uses: actions/upload-artifact@v2
         if: failure()
         with:
@@ -256,10 +260,11 @@ jobs:
           for f in tcl/*.tcl; do
             script/nglfar2ccov $f
           done
+          gcov -o lib envmodules
       - name: Uninstall Modules
         run: |
           make uninstall
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v2
       - uses: actions/upload-artifact@v2
         if: failure()
         with: