diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cea4094b88a24e8e99882cf463292133118ce9d6..3d59098bccdf3ae73479dc801e1847e0df8a820e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,20 @@ stages:
 
 ###### BUILDING ########
 
+review-app-build:
+  stage: build
+  image: collaborating.tuhh.de:5005/e-10/hoou/pontifex-core
+  script:
+    - sed -i -e "s;baseurl.*;baseurl = \"${REVIEW_BASE_DIR}/${CI_MERGE_REQUEST_ID}\";" config/production/config.toml
+    - sed -i -e "s;/js/basic.js;${REVIEW_BASE_DIR}/${CI_MERGE_REQUEST_ID}/js/basic.js;" layouts/shortcodes/header1.html
+    - sed -i -e "s;/js/basic2.js;${REVIEW_BASE_DIR}/${CI_MERGE_REQUEST_ID}/js/basic2.js;" layouts/shortcodes/header2.html
+    - /pontifex/bin/build_pontifex.sh
+  artifacts:
+    paths:
+      - public
+  rules:
+     - if: $CI_MERGE_REQUEST_ID
+
 review-build:
   stage: build
   image: collaborating.tuhh.de:5005/e-10/hoou/pontifex-core
@@ -40,6 +54,27 @@ master-build:
 
 ###### REVIEW ########
 
+review-app-deploy:
+  image: eltenedor/alpine-ssh #das ist das Image, das wir testweise verwenden können (kann ssh)
+  stage: review
+  script:
+#
+# SSH Setup
+#
+    - eval $(ssh-agent -s)  #variablen initialisieren
+    - echo "${REVIEW_SSH_PRIVATE_KEY}" | tr -d '\r' | ssh-add -  #private key laden
+    - mkdir -p ~/.ssh && touch ~/.ssh/known_hosts  # .ssh Verzeichnis anlegen und known_hosts dummy
+    - echo "${REVIEW_SSH_KNOWN_HOSTS}" >> ~/.ssh/known_hosts #dummy mit Inhalt füllen 
+    - chmod 700 ~/.ssh   # Berechtigungen setzen
+    - scp -r -P ${REVIEW_SSH_PORT} public/* ${REVIEW_SSH_USER}@${REVIEW_HOST_NAME}:${REVIEW_WEBSERVER_ROOT}/${CI_MERGE_REQUEST_ID} # möglicherweise ist rsync nicht installiert, dann scp nutzen
+  cache:
+    key: "$CI_COMMIT_REF_SLUG"
+  environment:
+    name: $CI_COMMIT_REF_NAME
+    url: https://$REVIEW_PROXY_HOST_NAME$REVIEW_BASE_DIR$CI_MERGE_REQUEST_ID
+  rules:
+     - if: $CI_MERGE_REQUEST_ID
+
 review-deploy:
   image: eltenedor/alpine-ssh #das ist das Image, das wir testweise verwenden können (kann ssh)
   stage: review