diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd10f4e12b2a057a7fce3f31ff6df79bee79b0ef..fae956719aec44874c2953b1ffe98e268955b4fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,19 @@ workflow:
       DOCKER_FPM_IMAGE_TAG: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHA
       DOCKER_NGINX_IMAGE_TAG: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHA
       APP_ENV: development
+      APP_URL: "https://${CI_COMMIT_REF_SLUG}.review.metager.de"
+  - if: $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "development"
+      variables:
+        DOCKER_COMPOSER_IMAGE_TAG: $CI_COMMIT_BRANCH-composer-$CI_COMMIT_SHA
+        DOCKER_FPM_IMAGE_TAG: $CI_COMMIT_BRANCH-$CI_COMMIT_SHA
+        DOCKER_NGINX_IMAGE_TAG: $CI_COMMIT_BRANCH-$CI_COMMIT_SHA
+  - if: $CI_COMMIT_BRANCH == "master"
+      variables:
+        APP_URL: https://metager.de
+  - if: $CI_COMMIT_BRANCH == "development"
+      variables:
+        APP_URL: https://metager3.de
+
 stages:
   - build_composer
   - build_dependencies
diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml
index d595c210af6be7927cf0d37fb2a4be317fe71601..da60e0b07f0080761776a5e6d0f0d3c8176e6740 100644
--- a/.gitlab/ci/deploy.yml
+++ b/.gitlab/ci/deploy.yml
@@ -9,6 +9,39 @@
     - .gitlab/deployment_scripts/update_secret.sh
     - .gitlab/deployment_scripts/update_deployment.sh
 
+deploy_development:
+  extends:
+    - .deploy
+  environment:
+    name: development
+    url: https://metager3.de
+    action: start
+  variables:
+    variables:
+    DEPLOYMENT_URL: "metager3.de"
+    DEPLOYMENT_HELM_VALUES: .gitlab/development.yaml
+    DEPLOYMENT_CHART_NAME: $CI_COMMIT_BRANCH
+  rules:
+    - if: '$CI_COMMIT_BRANCH != "development"'
+      when: never
+
+  deploy_production:
+  extends:
+    - .deploy
+  environment:
+    name: production
+    url: https://metager.de
+    action: start
+  variables:
+    variables:
+    DEPLOYMENT_URL: "metager.de"
+    DEPLOYMENT_HELM_VALUES: .gitlab/production.yaml
+    DEPLOYMENT_CHART_NAME: $CI_COMMIT_BRANCH
+  rules:
+    - if: '$CI_COMMIT_BRANCH != "development"'
+      when: never
+
+
 deploy_review:
   extends:
     - .deploy
@@ -22,7 +55,6 @@ deploy_review:
     DEPLOYMENT_URL: "${CI_COMMIT_REF_SLUG}.review.metager.de"
     DEPLOYMENT_HELM_VALUES: .gitlab/review.yaml
     DEPLOYMENT_CHART_NAME: review-${CI_COMMIT_REF_SLUG}
-    APP_URL: "https://${CI_COMMIT_REF_SLUG}.review.metager.de"
   rules:
     - if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "development"'
       when: never
diff --git a/.gitlab/development.yaml b/.gitlab/development.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..efd78eab5f468789156d35ffbaf8cb60a49f5bfa
--- /dev/null
+++ b/.gitlab/development.yaml
@@ -0,0 +1,20 @@
+ingress:
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+  hosts:
+    - host: metager3.de
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+        - path: /wsb
+            pathType: Prefix
+            backend:
+              service:
+                name: wsb
+                port:
+                  number: 80
+  tls:
+    - hosts:
+        - metager3.de
+      secretName: metager-tls
\ No newline at end of file
diff --git a/.gitlab/production.yaml b/.gitlab/production.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..476e79c76d5a965d76ab65dcbdd6cc8aca62a0fa
--- /dev/null
+++ b/.gitlab/production.yaml
@@ -0,0 +1,44 @@
+ingress:
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+  hosts:
+    - host: metager.de
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+        - path: /wsb
+            pathType: Prefix
+            backend:
+              service:
+                name: wsb
+                port:
+                  number: 80
+    - host: metager.org
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+        - path: /wsb
+            pathType: Prefix
+            backend:
+              service:
+                name: wsb
+                port:
+                  number: 80
+    - host: metager.es
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+        - path: /wsb
+            pathType: Prefix
+            backend:
+              service:
+                name: wsb
+                port:
+                  number: 80
+  tls:
+    - hosts:
+        - metager.de
+        - metager.org
+        - metager.es
+      secretName: metager-tls
\ No newline at end of file
diff --git a/.gitlab/review.yaml b/.gitlab/review.yaml
index 870ff001581d3c79d57e18274cb463f8362b1fb2..de4a768f51409f0d308627e9263c5648f38b5bf2 100644
--- a/.gitlab/review.yaml
+++ b/.gitlab/review.yaml
@@ -6,6 +6,13 @@ ingress:
     - paths:
         - path: /
           pathType: ImplementationSpecific
+        - path: /wsb
+            pathType: Prefix
+            backend:
+              service:
+                name: wsb
+                port:
+                  number: 80
   tls:
     - hosts:
         - "*.review.metager.de"