diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2da36042ad59381fe08649074ac3016b7be2faf..0c4656141f0252b1ac213c36de8d13d993825e6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,11 +17,45 @@ variables:
   ENV_PROD_HH_FILE_PATH: ${CONFIGS_FOLDER}/prod_hh/.env
 
 stages:
+  - prepare_config
   - build
-  # - test_and_qa
-  # - prepare_config
   # - deploy
 
+# ----------------------------------------------------------------------------------------------------------------------
+# Prepare Configuration
+# ----------------------------------------------------------------------------------------------------------------------
+prepare_config_staging:
+  stage: prepare_config
+  image:
+    name: alpine/git
+    entrypoint: ["/bin/sh", "-c"]
+  only:
+    - staging
+  script:
+    - set -x
+    - rm -rf ${CONFIGS_FOLDER} || true
+    - mkdir -p ${CONFIGS_FOLDER}
+    - git clone https://${CONFIG_DEPLOY_GITLAB_USERNAME}:${CONFIG_DEPLOY_GITLAB_TOKEN}@${CONFIGURATIONS_REPO} ${CONFIGS_FOLDER}
+  artifacts:
+    paths:
+      - ${ENV_STAGING_FILE_PATH}
+
+prepare_config_hx_hh:
+  stage: prepare_config
+  image:
+    name: alpine/git
+    entrypoint: ["/bin/sh", "-c"]
+  only:
+    - master
+  script:
+    - set -x
+    - rm -rf ${CONFIGS_FOLDER} || true
+    - mkdir -p ${CONFIGS_FOLDER}
+    - git clone https://${CONFIG_DEPLOY_GITLAB_USERNAME}:${CONFIG_DEPLOY_GITLAB_TOKEN}@${CONFIGURATIONS_REPO} ${CONFIGS_FOLDER}
+  artifacts:
+    paths:
+      - ${ENV_PROD_HX_FILE_PATH}
+      - ${ENV_PROD_HH_FILE_PATH}
 
 # ----------------------------------------------------------------------------------------------------------------------
 # build
@@ -47,6 +81,8 @@ build_staging:
     - docker version # verify docker cli is there. Also prints server info
     - export SERVER_IMAGE_TAG=${SERVER_IMAGE_TAG_STAGING}
     - echo ${SERVER_IMAGE_TAG}
+    - export SERVER_IMAGE_TAG_LATEST=${SERVER_IMAGE_TAG_LATEST_STAGING}
+    - echo ${SERVER_IMAGE_TAG_LATEST}
 
     # - docker pull ${SERVER_IMAGE_TAG_LATEST} || true
     # - docker build --cache-from ${SERVER_IMAGE_TAG_LATEST} --tag ${SERVER_IMAGE_TAG} --tag ${SERVER_IMAGE_TAG_LATEST} .
@@ -65,24 +101,8 @@ build_staging:
 #     - set -x
 #     - echo 'Implement these tests!'
 
-# # ----------------------------------------------------------------------------------------------------------------------
-# # Prepare Configuration
-# # ----------------------------------------------------------------------------------------------------------------------
-# prepare_config_staging:
-#   stage: prepare_config
-#   image:
-#     name: alpine/git
-#     entrypoint: ["/bin/sh", "-c"]
-#   only:
-#     - staging
-#   script:
-#     - set -x
-#     - rm -rf ${CONFIGS_FOLDER} || true
-#     - mkdir -p ${CONFIGS_FOLDER}
-#     - git clone https://${CONFIG_DEPLOY_GITLAB_USERNAME}:${CONFIG_DEPLOY_GITLAB_TOKEN}@${CONFIGURATIONS_REPO} ${CONFIGS_FOLDER}
-#   artifacts:
-#     paths:
-#       - ${ENV_STAGING_FILE_PATH}
+
+
 
 # # ----------------------------------------------------------------------------------------------------------------------
 # # Deploy to staging
@@ -116,25 +136,7 @@ build_staging:
 #   - kubectl apply -n ${CHEMBL_NS_STAGING} -f k8s-deployment.yaml
 #   - kubectl get pods -n ${CHEMBL_NS_STAGING}
 
-# # ----------------------------------------------------------------------------------------------------------------------
-# # Preprare configs for prod deployment
-# # ----------------------------------------------------------------------------------------------------------------------
-# prepare_config_hx_hh:
-#   stage: prepare_config
-#   image:
-#     name: alpine/git
-#     entrypoint: ["/bin/sh", "-c"]
-#   only:
-#     - master
-#   script:
-#     - set -x
-#     - rm -rf ${CONFIGS_FOLDER} || true
-#     - mkdir -p ${CONFIGS_FOLDER}
-#     - git clone https://${CONFIG_DEPLOY_GITLAB_USERNAME}:${CONFIG_DEPLOY_GITLAB_TOKEN}@${CONFIGURATIONS_REPO} ${CONFIGS_FOLDER}
-#   artifacts:
-#     paths:
-#       - ${ENV_PROD_HX_FILE_PATH}
-#       - ${ENV_PROD_HH_FILE_PATH}
+
 
 
 # # ----------------------------------------------------------------------------------------------------------------------