diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 25651f66571c7be459c4074a7890df940c50ce08..0e932ef2f55adcecd1eee76b51151fae037c9988 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -126,6 +126,7 @@ jobs:
                 python-version: '3.x'
         -   name: "Main Script"
             run: |
+                PROJECT=loopy
                 CONDA_ENVIRONMENT=.test-conda-env-py3.yml
                 curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
                 . ci-support.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c975b4d5f98e05fb5eb5b0b381963b340decd011..e4a2e3e0f6ebd6e937412755b5abb53f17aedf5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,9 @@
+stages:
+  - test
+  - deploy
+
 Python 3 POCL:
+  stage: test
   script:
   - export PY_EXE=python3
   - export PYOPENCL_TEST=portable:pthread
@@ -16,6 +21,7 @@ Python 3 POCL:
       junit: test/pytest.xml
 
 Python 3 POCL without arg check:
+  stage: test
   script:
   - export PY_EXE=python3
   - export PYOPENCL_TEST=portable:pthread
@@ -34,6 +40,7 @@ Python 3 POCL without arg check:
       junit: test/pytest.xml
 
 Python 3 Intel:
+  stage: test
   script:
   - export PY_EXE=python3
   - export PYOPENCL_TEST=intel
@@ -54,6 +61,7 @@ Python 3 Intel:
 
 
 Python 3 POCL Twice With Cache:
+  stage: test
   script: |
     export PY_EXE=python3
     export PYOPENCL_TEST=portable:pthread
@@ -87,6 +95,7 @@ Python 3 POCL Twice With Cache:
 #   - tags
 
 Python 3 POCL Examples:
+  stage: test
   script: |
     export PY_EXE=python3
     export PYOPENCL_TEST=portable:pthread
@@ -113,6 +122,7 @@ Python 3 POCL Examples:
   - tags
 
 Pylint:
+  stage: test
   script:
   # Needed to avoid name shadowing issues when running from source directory.
   - PROJECT_INSTALL_FLAGS="--editable"
@@ -126,7 +136,9 @@ Pylint:
   - tags
 
 Documentation:
+  stage: deploy
   script:
+  - PROJECT=loopy
   - EXTRA_INSTALL="pybind11 numpy"
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-docs.sh
   - ". ./build-docs.sh"
@@ -134,6 +146,7 @@ Documentation:
   - python3
 
 Flake8:
+  stage: test
   script:
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh
   - . ./prepare-and-run-flake8.sh "$CI_PROJECT_NAME" test examples
@@ -143,13 +156,14 @@ Flake8:
   - tags
 
 Benchmarks:
+  stage: test
   script:
-  - export CONDA_ENVIRONMENT=.test-conda-env.yml
-  - export PROJECT=loopy
-  - export PYOPENCL_TEST=portable:pthread
+  - CONDA_ENVIRONMENT=.test-conda-env.yml
+  - PROJECT=loopy
+  - PYOPENCL_TEST=portable:pthread
   - export LOOPY_NO_CACHE=1
   - export ASV_FACTOR=1.5
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-benchmark-py-project.sh
+  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-benchmark-py-project.sh
   - ". ./build-and-benchmark-py-project.sh"
   tags:
   - linux