diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index fb46f2a..9ebaa4d 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -18,6 +18,7 @@ jobs:
           - nixos-unstable
           - nixos-20.09
           - nixos-20.03
+          - nixos-21.05
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efb6ffa..b5907ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,15 @@
-image: nixpkgs/nix:nixos-20.03
-
 stages:
   - build
 
-nixos-unstable:
+build:
   stage: build
+  image: nixpkgs/nix:nixos-20.03
   script: nix-shell --run ./ci.sh
-  variables:
-    NIXPKGS_CHANNEL: nixos-unstable
-    IMAGE_TAG: latest
-
-nixos-20.03:
-  stage: build
-  script: nix-shell --run ./ci.sh
-  variables:
-    NIXPKGS_CHANNEL: nixos-20.03
-
-nixos-20.09:
-  stage: build
-  script: nix-shell --run ./ci.sh
-  variables:
-    NIXPKGS_CHANNEL: nixos-20.09
+  parallel:
+    matrix:
+      - NIXPKGS_CHANNEL: nixos-unstable
+        IMAGE_TAG: latest
+      - NIXPKGS_CHANNEL:
+          - nixos-20.03
+          - nixos-20.09
+          - nixos-21.05