diff --git a/.github/workflows/check-standalone.yaml b/.github/workflows/check-standalone.yaml
index bd3dc47..9d33afd 100644
--- a/.github/workflows/check-standalone.yaml
+++ b/.github/workflows/check-standalone.yaml
@@ -5,6 +5,7 @@ on:
     branches: [main, master]
   pull_request:
     branches: [main, master]
+  workflow_dispatch:
 
 name: Stanfunctions Support
 
@@ -34,11 +35,12 @@ jobs:
         with:
           r-version: ${{ matrix.config.r }}
           http-user-agent: ${{ matrix.config.http-user-agent }}
-          use-public-rspm: true
+          use-public-rspm: false
+          extra-repositories: 'https://stan-dev.r-universe.dev'
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: local::. rcmdcheck BH RcppParallel RcppEigen Rcpp rstan StanHeaders RCurl remotes V8
+          extra-packages: local::. rcmdcheck BH RcppParallel RcppEigen Rcpp RCurl remotes V8
 
       - name: Checkout lgpr package
         run: |
@@ -46,14 +48,18 @@ jobs:
 
       - name: Check against CRAN StanHeaders and CRAN RStan
         run: |
+          cran <- "https://packagemanager.posit.co/cran/latest"
+          install.packages(c("StanHeaders", "rstan"), repos = cran)
           rcmdcheck::rcmdcheck(path = "lgpr", args = c("--no-manual", "--as-cran"), build_args = "--no-manual")
         shell: Rscript {0}
 
       - name: Install Development StanHeaders and CRAN RStan
         run: |
           Sys.setenv(MAKEFLAGS=paste0("-j",parallel::detectCores()))
-          install.packages("StanHeaders", repos = c("https://mc-stan.org/r-packages/", getOption("repos")))
-          install.packages('rstan', type='source')
+          stan_universe <- "https://stan-dev.r-universe.dev"
+          cran <- "https://packagemanager.posit.co/cran/latest"
+          install.packages("StanHeaders", repos = stan_universe)
+          install.packages("rstan", repos = cran, type = "source")
         shell: Rscript {0}
 
       - name: Check against Development StanHeaders and CRAN RStan
@@ -64,32 +70,11 @@ jobs:
       - name: Install Development StanHeaders and Development RStan
         run: |
           Sys.setenv(MAKEFLAGS=paste0("-j",parallel::detectCores()))
-          install.packages("StanHeaders", repos = c("https://mc-stan.org/r-packages/", getOption("repos")))
-          install.packages("rstan", repos = c("https://mc-stan.org/r-packages/", getOption("repos")))
+          stan_universe <- "https://stan-dev.r-universe.dev"
+          install.packages(c("StanHeaders", "rstan"), repos = stan_universe)
         shell: Rscript {0}
 
       - name: Check against Development StanHeaders and Development RStan
         run: |
           rcmdcheck::rcmdcheck(path = "lgpr", args = c("--no-manual", "--as-cran"), build_args = "--no-manual")
         shell: Rscript {0}
-
-      - name: Checkout RStan Experimental branch
-        uses: actions/checkout@v6
-        with:
-          repository: stan-dev/rstan
-          ref: experimental
-          path: rstan
-          submodules: 'recursive'
-
-      - name: Install Experimental StanHeaders and Experimental RStan
-        run: |
-          Sys.setenv(MAKEFLAGS=paste0("-j",parallel::detectCores()))
-          install.packages("rstan/StanHeaders", type = "source", repos = NULL)
-          install.packages("rstan/rstan/rstan", type = "source", repos = NULL)
-        shell: Rscript {0}
-
-      - name: Check against Experimental StanHeaders and Experimental RStan
-        run: |
-          rcmdcheck::rcmdcheck(path = "lgpr", args = c("--no-manual", "--as-cran"), build_args = "--no-manual")
-        shell: Rscript {0}
-
diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml
index 276bb0c..6407c55 100644
--- a/.github/workflows/check-standard.yaml
+++ b/.github/workflows/check-standard.yaml
@@ -5,6 +5,7 @@ on:
     branches: [main, master]
   pull_request:
     branches: [main, master]
+  workflow_dispatch:
 
 name: R-CMD-check
 
@@ -39,6 +40,7 @@ jobs:
           r-version: ${{ matrix.config.r }}
           http-user-agent: ${{ matrix.config.http-user-agent }}
           use-public-rspm: true
+          extra-repositories: 'https://stan-dev.r-universe.dev'
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
@@ -50,7 +52,7 @@ jobs:
       - name: Install Development StanHeaders and CRAN RStan
         run: |
           Sys.setenv(MAKEFLAGS=paste0("-j",parallel::detectCores()))
-          install.packages("StanHeaders", repos = c("https://mc-stan.org/r-packages/", getOption("repos")))
+          install.packages("StanHeaders", repos = c("https://stan-dev.r-universe.dev", getOption("repos")))
           install.packages('rstan', type='source')
         shell: Rscript {0}
 
@@ -60,8 +62,8 @@ jobs:
       - name: Install Development StanHeaders and Development RStan
         run: |
           Sys.setenv(MAKEFLAGS=paste0("-j",parallel::detectCores()))
-          install.packages("StanHeaders", repos = c("https://mc-stan.org/r-packages/", getOption("repos")))
-          install.packages("rstan", repos = c("https://mc-stan.org/r-packages/", getOption("repos")))
+          install.packages("StanHeaders", repos = c("https://stan-dev.r-universe.dev", getOption("repos")))
+          install.packages("rstan", repos = c("https://stan-dev.r-universe.dev", getOption("repos")))
         shell: Rscript {0}
 
       - name: Check against Development StanHeaders and Development RStan
diff --git a/DESCRIPTION b/DESCRIPTION
index 2a9d70f..5cb3f1d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -41,10 +41,10 @@ URL: https://mc-stan.org/rstantools/, https://discourse.mc-stan.org/
 BugReports: https://github.com/stan-dev/rstantools/issues
 Encoding: UTF-8
 LazyData: true
-SystemRequirements: pandoc, C++14
+SystemRequirements: pandoc, C++17
 Imports: desc, stats, utils, Rcpp (>= 0.12.16), RcppParallel (>= 5.0.1)
 Suggests:
-    rstan (>= 2.17.2),
+    rstan (>= 2.36.0),
     usethis (>= 1.5.1),
     testthat (>= 2.0.0),
     knitr,