diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b65af1a..81a05aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,23 @@ default:
   image: registry.mareshq.com/mareshq/ci-toolkit:latest
 
 stages:
+  - lint
   - build
   - deploy:dry-run
   - deploy
 
+lint next.js:
+  stage: lint
+  image: node:18-alpine3.17
+  script:
+    - npm ci --frozen-lockfile
+    - npm run lint
+
+lint helm:
+  stage: lint
+  script:
+    - helm lint ./charts/backoffice -f ./charts/backoffice/values.dummy.yaml --quiet
+
 docker build:
   stage: build
   before_script: