diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc75b74d187a4dcbe4fd454ea7418ab5e1ac716c..fbf588dd9326c6840e0c985dc08e9a2c13228ee6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ default:
 build:linux:
     stage: build
     script:
-        - rustup show      # Print version info for debugging
+        - rustup show # Ensure correct toolchain is downloaded and installed
         - make -j "$(nproc)" all
 
 build:redox:
@@ -23,10 +23,7 @@ build:redox:
     variables:
         TARGET: x86_64-unknown-redox
     script:
-        - export RUSTUP_TOOLCHAIN="$HOME/.redoxer/toolchain"
-        - export PATH="$RUSTUP_TOOLCHAIN/bin:$PATH"
-        - rustup show      # Print version info for debugging
-        - make -j "$(nproc)" all
+        - ./redoxer.sh -j "$(nproc)" all
 
 test:linux:
     stage: test
@@ -46,11 +43,7 @@ test:redox:
     variables:
         TARGET: x86_64-unknown-redox
     script:
-        - export CARGO_TEST="redoxer"
-        - export RUSTUP_TOOLCHAIN="$HOME/.redoxer/toolchain"
-        - export PATH="$RUSTUP_TOOLCHAIN/bin:$PATH"
-        - export TEST_RUNNER="redoxer exec --folder . -- sh --"
-        - make test
+        - ./redoxer.sh test
     # TODO: Out of memory
     allow_failure: true