diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebb33f1..636b54f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,11 +6,9 @@ default:
   image: $DOCKER_IMAGE_TEST
 
 stages:
-  - build-docker-test
-  - build-docker-app
+  - build-docker
   - lint
   - test
-  - dast
 
 .setup_env: &setup_env
   before_script:
@@ -59,7 +57,7 @@ pages:
 # This job runs only when Dockerfile changes
 docker-build-test:
   image: docker:latest
-  stage: build-docker-test
+  stage: build-docker
   services:
     - docker:dind
   script:
@@ -76,7 +74,7 @@ docker-build-test:
 
 docker-build-app:
   image: docker:latest
-  stage: build-docker-app
+  stage: build-docker
   services:
     - docker:dind
   script:
@@ -88,7 +86,7 @@ include:
   - template: Jobs/SAST.gitlab-ci.yml
 
 dast:
-  stage: dast
+  stage: test
   image: ghcr.io/zaproxy/zaproxy:stable
   services:
     - name: $DOCKER_IMAGE_APP