diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
index 327613f7..53ec9786 100644
--- a/.github/workflows/R-CMD-check.yaml
+++ b/.github/workflows/R-CMD-check.yaml
@@ -34,10 +34,9 @@ jobs:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       RSPM: ${{ matrix.config.rspm }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
-
+      
     steps:
-      - uses: actions/checkout@v4
-
+      - uses: actions/checkout@v4        
       - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
@@ -52,16 +51,9 @@ jobs:
           brew install --cask xquartz
           
       - uses: r-lib/actions/setup-r-dependencies@v2
-        if: matrix.config.r == '3.6'
         with:
           extra-packages: any::rcmdcheck, soiltexture=?ignore-before-r=4.3.0, markovchain=?ignore-before-r=4.0.0, Hmisc=?ignore, knitr=?ignore-before-r=4.0.0, rmarkdown=?ignore-before-r=4.0.0, testthat=?ignore-before-r=4.0.0,
           needs: check
-          
-      - uses: r-lib/actions/setup-r-dependencies@v2
-        if: matrix.config.r != '3.6'
-        with:
-          extra-packages: any::rcmdcheck, markovchain=?ignore-before-r=4.0.0
-          needs: check
             
       - name: Install soilDB from r-universe (R-devel only)
         if: matrix.config.r == 'devel'
@@ -70,6 +62,13 @@ jobs:
         shell: Rscript {0}
         
       - uses: r-lib/actions/check-r-package@v2
+        if: matrix.config.r != '3.6'
+        with:
+          upload-snapshots: true
+        
+      - uses: r-lib/actions/check-r-package@v2
+        if: matrix.config.r == '3.6'
         with:
+          args: 'c("--no-manual", "--as-cran", "--no-build-vignettes", "--ignore-vignettes")'
           upload-snapshots: true