diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0323ee11c01e03219a788461fe593b10410cd20b..0eae7ada4819ff1c4251387f0d1064a937e5629a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,10 +6,10 @@ cache:
     - .maven/
 stages:
   # - lint
-  - build
+  # - build
   # - test
   # - analyze
-  - package
+  # - package
   - release
   - deploy
 
@@ -46,16 +46,16 @@ before_script:
 #     paths:
 #       - pmd.log
 
-maven-compile:
-  stage: build
-  script:
-    - ./mvnw -ntp compile -P-webapp -Dmaven.repo.local=$MAVEN_USER_HOME
-  artifacts:
-    paths:
-      - target/classes/
-      - target/generated-sources/
-    expire_in: 10 days
-  needs: []
+# maven-compile:
+#   stage: build
+#   script:
+#     - ./mvnw -ntp compile -P-webapp -Dmaven.repo.local=$MAVEN_USER_HOME
+#   artifacts:
+#     paths:
+#       - target/classes/
+#       - target/generated-sources/
+#     expire_in: 10 days
+#   needs: []
 
 # maven-test:
 #   # DinD service is required for Testcontainers
@@ -108,20 +108,15 @@ maven-compile:
 #   #    - ./mvnw -ntp org.jacoco:jacoco-maven-plugin:prepare-agent initialize sonar:sonar -Dsonar.organization=codeAbility -Dsonar.host.url=https://server.arctis.at/sonar/ -Dsonar.login=${SONAR_TOKEN} -Dmaven.repo.local=$MAVEN_USER_HOME
 #   allow_failure: true
 
-maven-package:
-  stage: package
-  script:
-    - ./mvnw -ntp verify -Pprod -DskipTests -Dmaven.repo.local=$MAVEN_USER_HOME
+# maven-package:
+#   stage: package
+#   script:
+#     - ./mvnw -ntp verify -Pprod -DskipTests -Dmaven.repo.local=$MAVEN_USER_HOME
 
 # Uncomment the following line to use gitlabs container registry. You need to adapt the REGISTRY_URL in case you are not using gitlab.com
 docker-push:
   stage: release
-  services:
-    - docker:20-dind
-  image: docker
   variables:
-    DOCKER_HOST: 'tcp://docker:2375'
-    DOCKER_TLS_CERTDIR: ''
     # only:
     #   refs:
     #     - development
@@ -129,7 +124,7 @@ docker-push:
     IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform
   script:
     - ./mvnw -ntp verify -Pprod -DskipTests -Dmaven.repo.local=$MAVEN_USER_HOME
-    - ./mvnw -ntp jib:dockerBuild -Pprod -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username=gitlab-ci-token  -Djib.to.auth.password=$CI_BUILD_TOKEN -Dmaven.repo.local=$MAVEN_USER_HOME
+    - ./mvnw combpile -ntp jib:build -Pprod -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username=gitlab-ci-token  -Djib.to.auth.password=$CI_BUILD_TOKEN -Dmaven.repo.local=$MAVEN_USER_HOME
   when: always
 
 deploy: