diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af59b81..9a32b08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,48 +3,53 @@ variables:
   DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}
 
 stages:
-  - build
-  - deploy
+- build
+- deploy
 
-build.npm:
+build:
   stage: build
-  image: node:16.5
-  variables:
-    CI: "false"
-  before_script:
-  - mkdir -p build
-  script:
-  - npm install --force
-  - npm run build
-
-deploy.default:
-  stage: deploy
   image:
     name: docker
   variables:
     BRANDING: villasweb
     DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
-  before_script:
-  - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
   script:
   - docker build --build-arg REACT_APP_BRAND=${BRANDING} --tag ${DOCKER_IMAGE}:${DOCKER_TAG} .
-  dependencies:
-  - build.npm
   tags:
   - docker
 
-deploy.slew:
+build.slew:
   variables:
     BRANDING: slew
     DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
-  extends: deploy.default
+  extends: build
 
-# Deploy latest tag on master branch
 deploy.latest:
+  stage: deploy
   variables:
-    BRANDING: villasweb
     DOCKER_TAG: latest
-  extends: deploy.default
+  before_script:
+  - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
+  script:
+  - docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
   only:
     refs:
     - master
+  tags:
+  - docker
+  dependencies:
+  - build
+
+deploy.slew:
+  stage: deploy
+  variables:
+    BRANDING: slew
+    DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
+  before_script:
+  - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
+  script:
+  - docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
+  tags:
+  - docker
+  dependencies:
+  - build.slew