diff --git a/.gitignore b/.gitignore
index ccf255f8..7db6d974 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,7 @@ nginx.conf
 /src/assets/guides/*
 
 # Don't expose configs
-/src/assets/configs/config.json
-/src/assets/configs/*.config.json
+/src/assets/configs/*config.json
 
 # Only exists if Bazel was run
 /bazel-out
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86b711b1..a64c5878 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,35 @@
 variables:
-     VERSION: "2.0.0"
-     BUILD_SCRIPTS_ROOT_PATH: "/home/gitlab-runner/ci_cd/k8s/metabolights-editor"
+     VERSION: "2.1.0"
+     BUILD_SCRIPTS_ROOT_PATH: "/home/gitlab-runner/ci_cd/k8s"
 workflow:
   rules:
     - if: $CI_COMMIT_BRANCH == "development" || $CI_COMMIT_BRANCH == "test" || $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "staging"
 stages:
   - build
+  - push
   - deploy
 
-build:
+checkout_configs:
   stage: build
   script:
-    - bash "$BUILD_SCRIPTS_ROOT_PATH/build.sh"
+    - bash "$BUILD_SCRIPTS_ROOT_PATH/checkout_configs.sh"
 
-deploy_editor:
+build_container:
+  stage: build
+  script:
+    - bash "$BUILD_SCRIPTS_ROOT_PATH/metabolights-editor/build_container.sh"
+
+push_container:
+  stage: push
+  script:
+    - bash "$BUILD_SCRIPTS_ROOT_PATH/push_container.sh"
+
+deploy:
   stage: deploy
   only:
       - test
       - staging
       - master
   script:
-    - bash "$BUILD_SCRIPTS_ROOT_PATH/deploy.sh"
+    - bash "$BUILD_SCRIPTS_ROOT_PATH/metabolights-editor/prepare_deployment_files.sh"
+    - bash "$BUILD_SCRIPTS_ROOT_PATH/metabolights-editor/deploy.sh"