diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49266cf6d938779be9c3ba508e9c71e8dd582ca9..52f3715eb207dead22d55292b704c652a318bd12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,14 +35,6 @@ variables:
 
   EMS_CLI: "mvn --batch-mode -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/pom.xml"
   EMS_BROKER_CLIENT_CLI: "mvn --batch-mode -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/broker-client/pom.xml"
-  #EMS_UTIL_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/util/pom.xml"
-  #EMS_BROKER_CLIENT_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/broker-client/pom.xml"
-  #EMS_BROKER_CEP_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/broker-cep/pom.xml"
-  #EMS_BAGUETTE_CLIENT_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/baguette-client/pom.xml"
-  #EMS_BAGUETTE_CLIENT_INSTALL_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/baguette-client-install/pom.xml"
-  #EMS_BAGUETTE_SERVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/baguette-server/pom.xml"
-  #EMS_TRANSLATOR_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/translator/pom.xml"
-  #EMS_SERVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f event-management/control-service/pom.xml"
 
   METASOLVER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f meta_solver/pom.xml"
   MQ_ADAPTER_CLI: "mvn --batch-mode -N -Dmaven.test.skip=$SKIP_TESTS -Ddocker.push=false -f mq-http-adapter/pom.xml"
@@ -152,30 +144,7 @@ build-required-part3:ems:
   image: $MAVEN_IMAGE
   script:
     - $EMS_CLI -Pwithout-docker clean install
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - $CI_PROJECT_DIR/event-management/bin
-      - $CI_PROJECT_DIR/event-management/config-files
-      - $CI_PROJECT_DIR/event-management/util/target
-      - $CI_PROJECT_DIR/event-management/translator/target
-      - $CI_PROJECT_DIR/event-management/broker-client/target
-      - $CI_PROJECT_DIR/event-management/broker-cep/target
-      - $CI_PROJECT_DIR/event-management/baguette-client/target
-      - $CI_PROJECT_DIR/event-management/baguette-client-install/target
-      - $CI_PROJECT_DIR/event-management/baguette-server/target
-      - $CI_PROJECT_DIR/event-management/control-service/target
-      - $CI_PROJECT_DIR/event-management/control-service/src/main/resources/public
-
-
-#build-required-part4:ems-util:
-#  stage: build-required-part4
-#  image: $MAVEN_IMAGE
-#  script:
-#    - $EMS_UTIL_CLI -Pwithout-docker clean install
-#  artifacts:
-#    paths:
-#      - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/event/util/
+
 
 build-required-part5:utility-generator:
   stage: build-required-part5
@@ -187,24 +156,6 @@ build-required-part5:utility-generator:
     paths:
       - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/utility-generator/
 
-#build-required-part5:ems-broker-cep:
-#  stage: build-required-part5
-#  image: $MAVEN_IMAGE
-#  script:
-#    - $EMS_BROKER_CEP_CLI -Pwithout-docker clean install
-#  artifacts:
-#    paths:
-#      - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/event/broker-cep/
-
-#build-required-part6:ems-baguette-server:
-#  stage: build-required-part6
-#  image: $MAVEN_IMAGE
-#  script:
-#    - $EMS_BAGUETTE_SERVER_CLI -Pwithout-docker clean install
-#  artifacts:
-#    paths:
-#      - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/event/baguette-server/
-
 build-required-part6:cp-solver:
   stage: build-required-part6
   image: $MAVEN_IMAGE
@@ -215,42 +166,6 @@ build-required-part6:cp-solver:
     paths:
       - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/cp-solver/
 
-#build-required-part7:ems-baguette-client-install:
-#  stage: build-required-part7
-#  image: $MAVEN_IMAGE
-#  script:
-#    - $EMS_BAGUETTE_CLIENT_INSTALL_CLI -Pwithout-docker clean install
-#  artifacts:
-#    paths:
-#      - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/event/baguette-client-install/
-#
-#build-required-part7:ems-broker-client:
-#  stage: build-required-part7
-#  image: $MAVEN_IMAGE
-#  script:
-#    - $EMS_BROKER_CLIENT_CLI -Pwithout-docker clean install
-#  artifacts:
-#    paths:
-#      - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/event/broker-client/
-#
-#build-required-part7:ems-translator:
-#  stage: build-required-part7
-#  image: $MAVEN_IMAGE
-#  script:
-#    - $EMS_TRANSLATOR_CLI -Pwithout-docker clean install
-#  artifacts:
-#    paths:
-#      - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/event/translator/
-
-#build-required-part8:ems-baguette-client:
-#  stage: build-required-part8
-#  image: $MAVEN_IMAGE
-#  script:
-#    - $EMS_BAGUETTE_CLIENT_CLI -Pwithout-docker clean install
-#  artifacts:
-#    paths:
-#      - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/event/baguette-client/
-
 build:cp-parser:
   stage: build
   image: $MAVEN_IMAGE
@@ -261,24 +176,6 @@ build:cp-parser:
     paths:
       - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/cp-parser/
 
-#build:ems-server:
-#  stage: build
-#  image: $MAVEN_IMAGE
-#  script:
-#    - $EMS_SERVER_CLI -Pwithout-docker clean install
-#  artifacts:
-#    paths:
-#      - /builds/melodic/melodic-upperware/maven_repo/eu/melodic/event-management/control-service/
-#
-#build:ems-server:
-#  stage: build
-#  image: $MAVEN_IMAGE
-#  script:
-#    - $EMS_SERVER_CLI -Pwithout-docker clean install
-#  artifacts:
-#    paths:
-#    - $CI_PROJECT_DIR/event-management/control-service/target
-
 deploy:melodic-upperware:
   stage: deploy
   only: