diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a74d442083b878356312f2166b44de9604c3314..f27b280d77fe3381d55b181a4e27d63f61474974 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
   REGISTRY_USER: chembl/eubopen
   APPLICATION: eubopen-web
-  SERVER_IMAGE_TAG: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:${CI_COMMIT_SHORT_SHA}
-  SERVER_IMAGE_TAG_LATEST: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:latest
+  SERVER_IMAGE_TAG_STAGING: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}:${CI_COMMIT_SHORT_SHA}-staging
+  SERVER_IMAGE_TAG_LATEST_STAGING: ${CI_REGISTRY}/${REGISTRY_USER}/${APPLICATION}-staging:latest
   DOCKER_DRIVER: overlay
   CONFIGS_FOLDER: run_config
   # Config staging
@@ -18,15 +18,15 @@ variables:
 
 stages:
   - build
-  - test_and_qa
-  - prepare_config
-  - deploy
+  # - test_and_qa
+  # - prepare_config
+  # - deploy
 
 
 # ----------------------------------------------------------------------------------------------------------------------
 # build
 # ----------------------------------------------------------------------------------------------------------------------
-build:
+build_staging:
   image:
     name: docker:latest
     entrypoint: ["/bin/sh", "-c"]
@@ -35,6 +35,8 @@ build:
     DOCKER_HOST: tcp://docker:2375
   services:
     - docker:dind
+  only:
+    - staging
   before_script:
     - mkdir -p $HOME/.docker
     - echo $DOCKER_AUTH_CONFIG > $HOME/.docker/config.json
@@ -43,10 +45,13 @@ build:
     - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
     - docker info
     - docker version # verify docker cli is there. Also prints server info
-    - docker pull ${SERVER_IMAGE_TAG_LATEST} || true
-    - docker build --cache-from ${SERVER_IMAGE_TAG_LATEST} --tag ${SERVER_IMAGE_TAG} --tag ${SERVER_IMAGE_TAG_LATEST} .
-    - docker push ${SERVER_IMAGE_TAG}
-    - docker push ${SERVER_IMAGE_TAG_LATEST}
+    - export SERVER_IMAGE_TAG=${SERVER_IMAGE_TAG_STAGING}
+    - echo ${SERVER_IMAGE_TAG}
+
+    # - docker pull ${SERVER_IMAGE_TAG_LATEST} || true
+    # - docker build --cache-from ${SERVER_IMAGE_TAG_LATEST} --tag ${SERVER_IMAGE_TAG} --tag ${SERVER_IMAGE_TAG_LATEST} .
+    # - docker push ${SERVER_IMAGE_TAG}
+    # - docker push ${SERVER_IMAGE_TAG_LATEST}
 
 # ----------------------------------------------------------------------------------------------------------------------
 # test