diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35980ae..8901bb5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,18 @@
+.hydra-cli:
+  image: docker.nix-community.org/nixpkgs/nix-flakes
+  script:
+    - nix run --inputs-from ./. nixpkgs#hydra-cli -- -H https://hydra.nix-community.org jobset-wait simple-nixos-mailserver "${jobset}"
+
 hydra-pr:
+  extends: .hydra-cli
   only:
     - merge_requests
-  image: nixos/nix
-  script:
-    - nix-shell -I nixpkgs=channel:nixos-24.11 -p hydra-cli --run 'hydra-cli -H https://hydra.nix-community.org jobset-wait simple-nixos-mailserver ${CI_MERGE_REQUEST_IID}'
+  variables:
+    jobset: $CI_MERGE_REQUEST_IID
 
 hydra-master:
+  extends: .hydra-cli
   only:
     - master
-  image: nixos/nix
-  script:
-    - nix-shell -I nixpkgs=channel:nixos-24.11 -p hydra-cli --run 'hydra-cli -H https://hydra.nix-community.org jobset-wait simple-nixos-mailserver master'
+  variables:
+    jobset: master