diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2051ffb644e70305059637d99a0363560b99922a..4eb174092ded9c020038e6a21c69031d3447a588 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,13 +8,12 @@ cache: &global_cache
   policy: pull-push
 
 stages:
-  - release
   - lint
   - build
   - test
-  # - deploy
+  - release
+  - deploy
   - e2e
-  - analyze
 
 before_script:
   - export NG_CLI_ANALYTICS="false"
@@ -61,11 +60,9 @@ maven-compile:
   cache: []
 
 maven-test:
-  # DinD service is required for Testcontainers
   services:
     - docker:20-dind
   variables:
-    # Instruct Testcontainers to use the daemon of DinD.
     DOCKER_HOST: 'tcp://docker:2375'
     DOCKER_TLS_CERTDIR: ''
   stage: test
@@ -90,14 +87,10 @@ maven-test:
     expire_in: 15 days
   needs: []
 
-#test
-
 frontend-test:
   stage: test
   cache:
-    # inherit all global cache settings
     <<: *global_cache
-    # override the policy
     policy: pull
   script:
     - npm test
@@ -121,10 +114,9 @@ docker-build:
   # only:
   #   refs:
   #     - development
-  # dependencies:
-  #   - docker-push
-  #   - maven-test
-  #   - frontend-test
+  dependencies:
+    - maven-test
+    - frontend-test
   before_script:
     - mkdir -p ~/.ssh
     - echo "${SSH_BKY_DEPLOY}" > ~/.ssh/id_rsa
@@ -139,40 +131,24 @@ docker-build:
     - ssh contDeploy@codeability-austria -p 1022 "cd gitsearch2/gitsearch && git pull && ./mvnw verify -Pprod -DskipTests jib:build -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: on_success
 
-# This pipeline step does not work with nfs file system
-# docker-push:
-#   stage: release
-#   cache: []
-#   # only:
-#   #   refs:
-#   #     - development
-#   variables:
-#     REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
-#     IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform
-#   script:
-#     - ./mvnw verify -Pprod -DskipTests jib:build -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: on_success
-
-# deploy:
-#   stage: deploy
-#   cache: []
-#   # only:
-#   #   refs:
-#   #     - development
-#   dependencies:
-#     - docker-push
-#     - maven-test
-#     - frontend-test
-#   before_script:
-#     - mkdir -p ~/.ssh
-#     - echo "${SSH_BKY_DEPLOY}" > ~/.ssh/id_rsa
-#     - chmod 700 ~/.ssh/id_rsa
-#     - eval "$(ssh-agent -s)"
-#     - ssh-add ~/.ssh/id_rsa
-#     - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
-#   script:
-#     - ssh contDeploy@codeability-austria -p 1022 "cd /home/michael/gitsearch && git pull && cd src/main/docker/ && docker pull sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform && GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` COMMIT_ID=`git rev-parse HEAD` SPRING_PROFILES_ACTIVE=staging,swagger docker-compose -f gitsearch.yml up  -d --no-deps --build --force-recreate gitsearch-app && exit"
-#   when: on_success
+deploy:
+  stage: deploy
+  cache: []
+  # only:
+  #   refs:
+  #     - development
+  dependencies:
+    - docker-build
+  before_script:
+    - mkdir -p ~/.ssh
+    - echo "${SSH_BKY_DEPLOY}" > ~/.ssh/id_rsa
+    - chmod 700 ~/.ssh/id_rsa
+    - eval "$(ssh-agent -s)"
+    - ssh-add ~/.ssh/id_rsa
+    - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+  script:
+    - ssh contDeploy@codeability-austria -p 1022 "cd gitsearch2/gitsearch && git pull && cd src/main/docker/ && docker pull sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform/gitsearch && GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` COMMIT_ID=`git rev-parse HEAD` SPRING_PROFILES_ACTIVE=staging,swagger docker-compose -f gitsearch.yml up  -d --no-deps --build --force-recreate gitsearch-app && exit"
+  when: on_success
 
 e2e-test:
   stage: e2e
@@ -186,8 +162,8 @@ e2e-test:
   #     - development
   services:
     - selenium/standalone-chrome
-  # dependencies:
-  #   - deploy
+  dependencies:
+    - deploy
   script:
     - npm install
     - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
@@ -198,7 +174,7 @@ e2e-test:
   when: on_success
 
 sonar-analyze:
-  stage: analyze
+  stage: test
   cache:
     # inherit all global cache settings
     <<: *global_cache