diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54673cb..6502c3d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,10 +5,19 @@
 # Container Scanning customization: https://docs.gitlab.com/ee/user/application_security/container_scanning/#customizing-the-container-scanning-settings
 # Note that environment variables can be set in several places
 # See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
+stages:
+  - test
+  - code_quality
+
+sast:
+  stage: 'test'
+include:
+- template: Security/SAST.gitlab-ci.yml
+- template: Security/Dependency-Scanning.gitlab-ci.yml
+
 qodana:
-  only:
-  - master
-  - merge_requests
+  stage: 'code_quality'
+
   image:
     name: jetbrains/qodana-python-community
     entrypoint:
@@ -29,11 +38,3 @@ qodana:
     expire_in: 1 week
     paths:
     - ".qodana/results/"
-stages:
-- test
-sast:
-  stage: test
-include:
-- template: Security/SAST.gitlab-ci.yml
-- template: Security/Dependency-Scanning.gitlab-ci.yml
-- template: Security/Secret-Detection.gitlab-ci.yml