diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0cdc2ecf..ba48ee332 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,15 +16,14 @@ variables:
   R_REL_VERSION:  "4.4"
   R_REL_WIN_BIN:  "https://cloud.r-project.org/bin/windows/base/old/4.4.1/R-4.4.1-win.exe"
   RTOOLS_REL_BIN: "https://cloud.r-project.org/bin/windows/Rtools/rtools44/files/rtools44-6104-6039.exe"
-  RTOOLS43_HOME:  "/c/rtools"
+  RTOOLS44_HOME:  "/c/rtools" # needed for finding gcc #6552
   R_DEV_VERSION:  "4.5"
   R_DEV_WIN_BIN:  "https://cloud.r-project.org/bin/windows/base/R-devel-win.exe"
-  RTOOLS_DEV_BIN: "https://cloud.r-project.org/bin/windows/Rtools/rtools44/files/rtools44-6104-6039.exe"
-  RTOOLS44_HOME:  "" ## in case R-devel will use new Rtools toolchain, now it uses 4.4 env var
+  RTOOLS_DEV_BIN: "https://cloud.r-project.org/bin/windows/Rtools/rtools44/files/rtools44-6104-6039.exe" # dev uses same rtools as release
   R_OLD_VERSION:  "4.3"
   R_OLD_WIN_BIN:  "https://cloud.r-project.org/bin/windows/base/old/4.3.3/R-4.3.3-win.exe"
   RTOOLS_OLD_BIN: "https://cloud.r-project.org/bin/windows/Rtools/rtools43/files/rtools43-5958-5975.exe"
-  RTOOLS42_HOME:  "/c/rtools"
+  RTOOLS43_HOME:  "/c/rtools" # needed for finding gcc #6552
 
 stages:
   - dependencies
diff --git a/CODEOWNERS b/CODEOWNERS
index dc2aba5a1..6d12041c3 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -68,3 +68,6 @@
 # docs
 /man/openmp-utils.Rd @Anirban166
 /Seal_of_Approval.md @tdhock
+
+# GLCI
+.gitlab-ci.yml @jangorecki @ben-schwen