diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc490f2b9..e0d1c08e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,8 +50,6 @@ node modules:
     - install -v -T -m 0400 "${SSH_DEPLOY_KEY}" ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config;
     - install -v -T -m 0644 "${FONTAWESOME_NPM_AUTH_FILE}" /etc/fontawesome-token
     - install -v -T -m 0644 "${NIX_NETRC}" /etc/nix/netrc
-    - mkdir -p "$HOME/.config/nix"
-    - echo 'experimental-features = nix-command flakes' > "$HOME/.config/nix/nix.conf"
   artifacts:
     paths:
       - node_modules/
@@ -63,7 +61,7 @@ node modules:
 frontend lint:
   stage: lint
   script:
-    - "nix develop --comand 'make frontend-lint'"
+    - "nix shell .#gnumake .#gup .#nodejs_21 --comand 'make frontend-lint'"
   before_script: *nix-before
   needs:
     - job: node modules
@@ -79,7 +77,7 @@ frontend build:
       paths:
         - .well-known-cache
   script:
-    - "nix develop --command 'make frontend-build'"
+    - "nix shell .#gnumake .#gup .#nodejs_21 --command 'make frontend-build'"
   before_script: *nix-before
   needs:
     - job: node modules
diff --git a/flake.nix b/flake.nix
index 4401fedde..cfcf1dce4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -107,8 +107,7 @@
             (final: prev: let
                 pkgs = import nixpkgs { inherit system; };
                in {
-                 inherit (pkgs) gup dockerTools nodejs_21 glibcLocalesUtf8 tzdata exiftools chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot;
-                 make = pkgs.stdenv;
+                 inherit (pkgs) gup dockerTools nodejs_21 glibcLocalesUtf8 tzdata exiftools chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot make;
                  stack = pkgs.symlinkJoin {
                   inherit (pkgs.stack) name;
                   paths = [pkgs.stack];