diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b931175..6ea320b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,12 @@
 stages:
-    - qa
+    - lint
+    - test
     - publish
     - deploy
 
 test:
     image: python:3.7
-    stage: qa
+    stage: test
     services:
         - postgres:12
     variables:
@@ -21,24 +22,24 @@ test:
         - python manage.py createdefaultadmin
         - python manage.py test
 
-pycodestyle:
+lint:pycodestyle:
     image: python:3.7
-    stage: qa
+    stage: lint
     script:
         - pip install pycodestyle
         - pycodestyle --config=setup.cfg --count .
 
-eslint:
+lint:eslint:
     image: node:alpine
-    stage: qa
+    stage: lint
     before_script:
         - npm install
     script:
         - npm run eslint
 
-remark:
+lint:remark:
     image: node:alpine
-    stage: qa
+    stage: lint
     before_script:
         - npm install
     script: