diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a607dba1cb593f2c0cd4286be65488cf9fdfd14d..af636f6f87cc09db4b2e86125e324563b695d1e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,7 @@ workflow:
 variables:
   MAVEN_OPTS: "-Xmx500m -XX:+UseSerialGC -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN"
   MAVEN_CLI_OPTS: "--batch-mode -DskipDeployBigArtefact=true -s $CI_PROJECT_DIR/ci_settings.xml"
+  MAIN_BRANCH: $CI_DEFAULT_BRANCH
 
 stages:
 - build
@@ -32,10 +33,10 @@ maven-build:
     when: never 
   - if: $CI_COMMIT_TAG != null
     when: never 
-  - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH
+  - if: $CI_COMMIT_REF_NAME != $MAIN_BRANCH
     variables:
       MAVEN_GOAL: "install"
-  - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+  - if: $CI_COMMIT_REF_NAME == $MAIN_BRANCH
     variables:
       MAVEN_GOAL: "deploy"
 
@@ -52,7 +53,7 @@ maven-build:
     when: never 
   - if: $CI_COMMIT_TAG != null
     when: on_success
-  - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH
+  - if: $CI_COMMIT_REF_NAME != $MAIN_BRANCH
     when: never
   - when: on_success 
   artifacts:
@@ -100,11 +101,11 @@ maven-prepare-docker-contexts-others:
     paths:
     - './xplan-docker/**/target/docker/**/tmp/docker-build.tar.gz'
     - './xplan-database/xplan-database-scripts/target/docker/**/tmp/docker-build.tar.gz'
+    - './xplan-tests/xplan-tests-soapui/target/docker/**/tmp/docker-build.tar.gz'
     - './xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/target/docker/**/tmp/docker-build.tar.gz'
     - './xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/target/docker/**/tmp/docker-build.tar.gz'
     - './xplan-webservices/xplan-webservices-services/xplan-services-docker/target/docker/**/tmp/docker-build.tar.gz'
-    - './xplan-webservices/xplan-webservices-services/xplan-services-docker/target/docker/**/tmp/docker-build.tar.gz'
-    - './xplan-tests/xplan-tests-soapui/target/docker/**/tmp/docker-build.tar.gz'
+    - './xplan-webservices/xplan-webservices-validator-wms/target/docker/**/tmp/docker-build.tar.gz'
 
 include: ci/all-kaniko-builds.gitlab-ci.yml
 
diff --git a/ci/all-kaniko-builds.gitlab-ci.yml b/ci/all-kaniko-builds.gitlab-ci.yml
index 1dd6ba7fb062c886c68821928da9bfa816edd90b..7655554e0be2c992d2c58d10d37cc171eb6a56ab 100644
--- a/ci/all-kaniko-builds.gitlab-ci.yml
+++ b/ci/all-kaniko-builds.gitlab-ci.yml
@@ -16,7 +16,7 @@
     when: never 
   - if: $CI_COMMIT_TAG != null
     when: on_success
-  - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH
+  - if: $CI_COMMIT_REF_NAME != $MAIN_BRANCH
     when: never 
   - when: on_success 
   variables:
@@ -38,7 +38,7 @@ kaniko:xplan-db-updater:
   extends: .kaniko:build
   variables:
     dockerImageName: xplan-db-updater
-    tarGzFile: xplan-resources/xplan-database-scripts/target/docker/xplanbox/xplan-db-updater/tmp/docker-build.tar.gz
+    tarGzFile: xplan-database/xplan-database-scripts/target/docker/xplanbox/xplan-db-updater/tmp/docker-build.tar.gz
   needs:
     - maven-prepare-docker-contexts-others