diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45c28f368b1a0ab8e778094b0fac7ccd2e4fc34a..ff0a491cacd9b07811c8403d479e216710457a12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,6 @@ stages:
 
 variables:
   R_LIBS_USER: "$CI_PROJECT_DIR/ci/lib"
-  CHECK_DIR: "$CI_PROJECT_DIR/ci/logs"
-  BUILD_LOGS_DIR: "$CI_PROJECT_DIR/ci/logs/airGR.Rcheck"
 
 default:
   before_script:
@@ -38,8 +36,7 @@ default:
 .check:
   stage: check
   script:
-  - R -e 'devtools::check(check_dir = Sys.getenv("CHECK_DIR"), cran = !as.logical(Sys.getenv("NOT_CRAN")), env_vars = c(NOT_CRAN = Sys.getenv("NOT_CRAN")))'
-  - R -e 'if (length(devtools::check_failures(path = Sys.getenv("BUILD_LOGS_DIR"), note = FALSE)) > 0) stop()'
+  - R -e ' rcmdcheck::rcmdcheck(args = ifelse(as.logical(Sys.getenv("NOT_CRAN")), "", "--as-cran"), error_on = "warning")'
 
 .check_not_cran:
   variables: