diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5e4c9df..711c2a4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,8 +11,9 @@ before_script:
 stages:
   - build
   - test
-  - deploy
+  - audit
   - publish
+  - deploy
 
 build:
   stage: build
@@ -22,6 +23,21 @@ build:
     paths:
       - lib
 
+docker build:
+  image: registry.gitlab.com/openstapps/projectmanagement/builder
+  stage: test
+  variables:
+    DOCKER_DRIVER: overlay2
+  services:
+    - docker:dind
+  script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
+    - docker build -t registry.gitlab.com/openstapps/projectmanagement/builder -f images/builder/Dockerfile .
+    - docker build -t registry.gitlab.com/openstapps/projectmanagement/node -f images/node/Dockerfile .
+  tags:
+    - docker
+  before_script: []
+
 docker-builder:
   image: registry.gitlab.com/openstapps/projectmanagement/builder
   stage: build
@@ -56,20 +72,20 @@ docker-node:
     - docker
   before_script: []
 
-audit:
+npm:
   allow_failure: true
   except:
     - schedules
   script:
     - npm audit
-  stage: test
+  stage: audit
 
-scheduled-audit:
+scheduled npm:
   only:
     - schedules
   script:
     - npm audit
-  stage: test
+  stage: audit
 
 pages:
   stage: deploy