diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 811d66477b21874b010265206aa060592596f5d2..2dc995d8410b8189c5054c062d8e9a3292502d78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,35 +1,19 @@
-stages:
-  - build
-  - deploy
-
 variables:
-  EXPORT_DIR: "/var/www/html/pages"
   RELEASE_DIR: "release_target_211"
 
-build-p2:
-  stage: build
+pages:
+  stage: deploy
   tags: 
     - docker
   image: maven:3.6.3-adoptopenjdk-15
   script:
     - mvn --version
-    - mvn clean install
-  only:
-    - master
+    - mvn clean install   # build p2 repo
+    - rm -rf public
+    - mkdir -p "public/$RELEASE_DIR"
+    - cp -r de.hft-stuttgart.indriya.p2site/target/repository/* "public/$RELEASE_DIR"
   artifacts:
     paths:
-      - de.hft-stuttgart.indriya.p2site/target/repository/
-    expire_in: 1 day
-     
-pages-master:
-  stage: deploy
-  dependencies:
-    - build-p2
-  tags: 
-    - production # use special CLI runner for publishing to $EXPORT_DIR
-  script:
-    - rm -rf "$EXPORT_DIR/$CI_PROJECT_NAME"
-    - mkdir -p "$EXPORT_DIR/$CI_PROJECT_NAME/$RELEASE_DIR"
-    - cp -r de.hft-stuttgart.indriya.p2site/target/repository/* "$EXPORT_DIR/$CI_PROJECT_NAME/$RELEASE_DIR"
+      - public
   only:
-    - master
+  - master