diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2edd2c12ad3f5ef08e673a3e8b2ee9ab56c42e74..0b997067c02f73ecf780d01798272448a3d71418 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,8 @@ include:
   - local: 'images/.utils/gitlab-ci.yaml'
   - local: 'charts/.utils/gitlab-ci.yaml'
 stages:
+  - lint
   - build
-  - test
   - changelog
   - release
 
diff --git a/charts/.utils/gitlab-ci.yaml b/charts/.utils/gitlab-ci.yaml
index 0801e34c526dbf1d63daf0473eeb2960c206fdf5..46ab14fb5355c82e0dda216f40621cdd04c67a8b 100644
--- a/charts/.utils/gitlab-ci.yaml
+++ b/charts/.utils/gitlab-ci.yaml
@@ -5,7 +5,7 @@
           - keycloak
           - mok
 
-chart-build-keycloak:
+chart-package:
   stage: build
   extends: .chart-matrix
   image: quay.io/helmpack/chart-testing:v3.6.0
@@ -19,7 +19,7 @@ chart-build-keycloak:
         - charts/${CHART}/Chart.yaml
 
 chart-helm-unittest:
-  stage: test
+  stage: lint
   extends: .chart-matrix
   image:
     name: docker.io/quintush/helm-unittest:3.10.0-0.2.9
@@ -36,4 +36,4 @@ chart-helm-unittest:
       changes:
         - charts/${CHART}/**/*
       exists:
-        - charts/${CHART}/tests/
+        - charts/${CHART}/tests/**/*