diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed0c1fa7d6a14e0232a00b8673fee853aa53fd36..704e0015a0378cf9bf0515eb876c65f019f4e86b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,5 @@
 stages:
+  - "Code Quality"
   - pretest
   - test
   - prerelease
@@ -31,10 +32,11 @@ testsuite-cuda-py3.10:
   stage: pretest
   extends: .every-commit
   image: i10git.cs.fau.de:5005/pycodegen/pycodegen/nox:ubuntu24.04-cuda12.6
+  needs: []
   script:
     - mkdir -p ~/.config/matplotlib
     - echo "backend:template" > ~/.config/matplotlib/matplotlibrc
-    - nox -s testsuite_gpu-3.10(cupy12)
+    - nox -s "testsuite_gpu-3.10(cupy12)"
   tags:
     - docker
     - cuda11
@@ -94,27 +96,15 @@ tests-and-coverage-with-longrun:
     - cuda11
     - AVX
 
-minimal-conda:
-  stage: pretest
-  extends: .every-commit
-  image: i10git.cs.fau.de:5005/pycodegen/pycodegen/minimal_conda
-  script:
-    - pip install git+https://gitlab-ci-token:${CI_JOB_TOKEN}@i10git.cs.fau.de/pycodegen/pystencils.git@master#egg=pystencils
-    - pip install -e .
-    - python quicktest.py
-  tags:
-    - docker
-
 # Linter for code formatting
 flake8-lint:
-  stage: pretest
+  stage: "Code Quality"
   extends: .every-commit
-  image: i10git.cs.fau.de:5005/pycodegen/pycodegen/full
+  image: i10git.cs.fau.de:5005/pycodegen/pycodegen/nox:alpine
   script:
-    - flake8 src/lbmpy
+    - nox -s lint
   tags:
     - docker
-    - cuda11
 
 # -------------------------- Tests -------------------------------------------------------------------------------------