diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
index 32d8420a6..665b6a875 100644
--- a/.github/workflows/R-CMD-check.yaml
+++ b/.github/workflows/R-CMD-check.yaml
@@ -34,7 +34,8 @@ jobs:
       matrix:
         config:
           - {os: macOS-latest,   r: 'release', rtools: ''}
-          - {os: windows-latest, r: 'release', rtools: '42'}
+          ## to reactivate once rstan is updated on CRAN
+          ## - {os: windows-latest, r: 'release', rtools: '42'}
           - {os: ubuntu-latest,   r: 'release', rtools: ''}
           - {os: ubuntu-latest,   r: 'oldrel-1', rtools: ''}
           - {os: ubuntu-latest,   r: 'devel', rtools: ''}
@@ -54,6 +55,8 @@ jobs:
           sudo apt-get install -y libcurl4-openssl-dev || true
           sudo apt-get install -y openmpi-bin openmpi-common libopenmpi-dev || true
           sudo apt-get install -y libpng-dev || true
+          ## to remove once rstan is updated on CRAN
+          sudo apt-get install -y libharfbuzz-dev libfribidi-dev || true
       - uses: r-lib/actions/setup-pandoc@v2
 
       - uses: r-lib/actions/setup-r@v2
@@ -68,6 +71,14 @@ jobs:
           extra-packages: any::rcmdcheck
           needs: check
 
+      ## to remove once rstan is updated on CRAN
+      - name: Manually install dev versions of StanHeaders and rstan
+        run: |
+          install.packages("devtools")
+          devtools::install_github("stan-dev/rstan/StanHeaders@develop")
+          devtools::install_github("stan-dev/rstan/rstan/rstan@develop")
+        shell: Rscript {0}
+
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
index e9a51d259..4738c0def 100644
--- a/.github/workflows/test-coverage.yaml
+++ b/.github/workflows/test-coverage.yaml
@@ -29,6 +29,14 @@ jobs:
           extra-packages: any::covr
           needs: coverage
 
+      ## to remove once rstan is updated on CRAN
+      - name: Manually install dev versions of StanHeaders and rstan
+        run: |
+          install.packages("devtools")
+          devtools::install_github("stan-dev/rstan/StanHeaders@develop")
+          devtools::install_github("stan-dev/rstan/rstan/rstan@develop")
+        shell: Rscript {0}
+
       - name: Test coverage
         run: covr::codecov(quiet = FALSE)
-        shell: Rscript {0}
\ No newline at end of file
+        shell: Rscript {0}