diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a9d7d56..3fd3efa8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,8 @@
-image: registry.gitlab.com/openstapps/projectmanagement/node:latest
+image: registry.gitlab.com/openstapps/projectmanagement/node
 
 cache:
   key: ${CI_COMMIT_REF_SLUG}
   paths:
-    - lib
     - node_modules
 
 stages:
@@ -11,25 +10,21 @@ stages:
   - test
   - publish
 
+before_script:
+  - npm install
+
 build:
-  before_script:
-    - npm install
   stage: build
   script:
     - npm run build
   artifacts:
-    untracked: true
     paths:
-      - node_modules/
-  only:
-    - /(^v[0-9]+\.[0-9]+\.[0-9]+$|^master$|^develop$)/
+      - lib
   tags:
     - docker
 
 test:
   stage: test
-  dependencies:
-    - build
   script:
     - npm test
   tags:
@@ -39,7 +34,6 @@ publish:
   image: registry.gitlab.com/openstapps/projectmanagement/builder
   stage: publish
   dependencies:
-    - test
     - build
   variables:
     DOCKER_DRIVER: overlay2