diff --git a/02_hetzner/03_baseline/baseline-demo/deployment.yaml b/02_hetzner/03_baseline/baseline-demo/deployment.yaml
new file mode 100644
index 0000000..9fa3d62
--- /dev/null
+++ b/02_hetzner/03_baseline/baseline-demo/deployment.yaml
@@ -0,0 +1,226 @@
+# Deployment description
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: baseline-deployment
+  namespace: baseline-environment
+  labels:
+    app: baseline-demo
+spec:
+  strategy:
+    type: Recreate
+  replicas: 1
+  selector:
+    matchLabels:
+      app: baseline-demo
+  template:
+    metadata:
+      labels:
+        app: baseline-demo
+    spec:
+      containers:
+        - name: baseline-frontend
+          image: packages.semapp.lan:5000/baseline_frontend:qa1
+          workingDir: /srv/web
+          resources:
+            requests:
+              memory: "256Mi"
+              cpu: "100m"
+            limits:
+              memory: "512Mi"
+              cpu: "4"
+          ports:
+            - containerPort: 8000
+              name: baseline-http
+              protocol: TCP
+          volumeMounts:
+          - mountPath: /etc/nginx/conf.d
+            readOnly: true
+            name: baseline-demo-frontend-conf
+          env:
+            - name: KEYCLOAK_REALM
+              value: "baseline_demo"
+            - name: KEYCLOAK_CLIENT
+              value: "baseline_demo"
+            - name: KEYCLOAK_TOKEN_VALIDITY
+              value: "600"
+            - name: KEYCLOAK_URL
+              value: "http://keycloak.semprod.local/auth/"
+          imagePullPolicy: Always
+
+        - name: baseline-backend
+          image: packages.semapp.lan:5000/baseline_backend:qa1
+          workingDir: /opt/www
+          resources:
+            requests:
+              memory: "256Mi"
+              cpu: "100m"
+            limits:
+              memory: "512Mi"
+              cpu: "4"
+          ports:
+            - containerPort: 5000
+              name: bl-bck-http
+              protocol: TCP
+          imagePullPolicy: Always
+          envFrom:
+            - configMapRef:
+                name: baseline-demo-backend-conf
+      volumes:
+        - name: baseline-demo-frontend-conf
+          configMap:
+            name: baseline-demo-frontend-conf
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: baseline-environment
+  name: baseline-demo-backend-conf
+  labels:
+    app: baseline-demo
+data:
+  DB_CONNECTION: "pgsql"
+  DB_HOST: "psql.semprod.local"
+  DB_PORT: "5432"
+  DB_DATABASE: "baseline_demo"
+  DB_USERNAME: "baseline_demo"
+  DB_PASSWORD: "yZLi2WZ037l9Xcgg"
+
+  APP_NAME: "Baseline"
+  APP_ENV: "production"
+  APP_KEY: "base64:14Vg4rilGKEk34XeqNR7ffg6GhFTzA7/z5T1aqy6JHw="
+
+  APP_DEBUG: "true"
+  APP_URL: "https://demo-baseline.semapp.de/"
+
+  LOG_CHANNEL: "stack"
+  BROADCAST_DRIVER: "log"
+  CACHE_DRIVER: "file"
+  QUEUE_CONNECTION: "sync"
+  SESSION_DRIVER: "cookie"
+  SESSION_LIFETIME: "120"
+
+
+  SANCTUM_STATEFUL_DOMAINS: "demo-baseline.semapp.de"
+  SESSION_DOMAIN: "demo-baseline.semapp.de"
+
+  THROTTLE_MAX_ATTEMPTS: "80" 
+
+  KEYCLOAK_URL: "http://keycloak.semprod.local"
+  KEYCLOAK_PORT: "80"
+  KEYCLOAK_REALM: "baseline_demo"
+
+  REDIRECT_URL: "https://demo-baseline.semapp.de/"
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: baseline-environment
+  name: baseline-demo-frontend-conf
+data:
+  default.conf: | 
+    upstream backend {
+      server  baseline-backend-demo:5000;
+    }
+
+    server {
+      listen 8000;
+
+      access_log /var/log/nginx/access.log;
+      charset utf-8;
+      client_max_body_size 1G;
+
+      location / {
+        root /srv/web;
+        add_header X-Frame-Options "SAMEORIGIN";
+        index index.html index.htm;
+        try_files $uri $uri /index.html =404;
+      }
+
+      location ~ ^/api {
+        proxy_pass        http://backend;
+        proxy_redirect    off;
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+        proxy_read_timeout 300s;
+        proxy_send_timeout 300s;
+        send_timeout 300s;
+      }
+
+      error_page 404 =200 /index.html;
+
+      add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
+
+      expires off;
+      open_file_cache off;
+      sendfile off;
+    }
+
+---
+# EFC Service
+apiVersion: v1
+kind: Service
+metadata:
+  name: baseline-frontend-demo
+  namespace: basline-environment
+spec:
+  selector:
+    app: baseline-demo
+  ports:
+    - name: baseline-http
+      port: 8000
+      targetPort: baseline-http
+  type: NodePort
+
+---
+# EFC backend
+apiVersion: v1
+kind: Service
+metadata:
+  name: baseline-backend-demo
+  namespace: baseline-environment
+spec:
+  selector:
+    app: baseline-demo
+  ports:
+    - name: bl-bck-http
+      port: 5000
+      targetPort: bl-bck-http
+  type: NodePort
+---
+
+# Ingress description
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: baseline-demo-ingress
+  namespace: baseline-environment
+  annotations:
+    kubernetes.io/ingress.class: "traefik"
+spec:
+  rules:
+  - host: baseline-demo.k8s.semprod.local
+    http:
+      paths:
+      - backend:
+          service:
+            name: baseline-frontend-demo
+            port:
+              number: 8000
+        path: /
+        pathType: ImplementationSpecific
+  - host: demo-baseline.semapp.de
+    http:
+      paths:
+      - backend:
+          service:
+            name: baseline-frontend-demo
+            port:
+              number: 8000
+        path: /
+        pathType: ImplementationSpecific
\ No newline at end of file
diff --git a/02_hetzner/01_prod/baseline/deployment.yaml b/02_hetzner/03_baseline/baseline/deployment.yaml
similarity index 80%
rename from 02_hetzner/01_prod/baseline/deployment.yaml
rename to 02_hetzner/03_baseline/baseline/deployment.yaml
index 64a3205..6a6df70 100644
--- a/02_hetzner/01_prod/baseline/deployment.yaml
+++ b/02_hetzner/03_baseline/baseline/deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: baseline-deployment
-  namespace: prod-environment
+  namespace: baseline-environment
   labels:
     app: baseline-prod
 spec:
@@ -75,7 +75,7 @@ spec:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: prod-environment
+  namespace: baseline-environment
   name: baseline-prod-backend-conf
   labels:
     app: baseline-prod
@@ -91,7 +91,7 @@ data:
   APP_ENV: "production"
   APP_KEY: "base64:14Vg4rilGKEk34XeqNR7ffg6GhFTzA7/z5T1aqy6JHw="
   APP_DEBUG: "true"
-  APP_URL: "http://baseline.k8s.semprod.local/"
+  APP_URL: "https://baseline.semapp.de/"
 
   LOG_CHANNEL: "stack"
   BROADCAST_DRIVER: "log"
@@ -101,8 +101,8 @@ data:
   SESSION_LIFETIME: "120"
 
 
-  SANCTUM_STATEFUL_DOMAINS: "baseline.k8s.semprod.local"
-  SESSION_DOMAIN: "baseline.k8s.semprod.local"
+  SANCTUM_STATEFUL_DOMAINS: "baseline.semapp.de"
+  SESSION_DOMAIN: "baseline.semapp.de"
 
   THROTTLE_MAX_ATTEMPTS: "80" 
 
@@ -110,13 +110,13 @@ data:
   KEYCLOAK_PORT: "80"
   KEYCLOAK_REALM: "baseline_production"
 
-  REDIRECT_URL: "http://baseline.k8s.semprod.local/"
+  REDIRECT_URL: "https://baseline.semapp.de/"
 
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: prod-environment
+  namespace: baseline-environment
   name: baseline-prod-frontend-conf
 data:
   default.conf: | 
@@ -166,7 +166,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: baseline-frontend-prod
-  namespace: prod-environment
+  namespace: baseline-environment
 spec:
   selector:
     app: baseline-prod
@@ -182,7 +182,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: baseline-backend-prod
-  namespace: prod-environment
+  namespace: baseline-environment
 spec:
   selector:
     app: baseline-prod
@@ -198,7 +198,7 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: baseline-prod-ingress
-  namespace: prod-environment
+  namespace: baseline-environment
   annotations:
     kubernetes.io/ingress.class: "traefik"
 spec:
@@ -209,4 +209,36 @@ spec:
       - path: /
         backend:
           serviceName: baseline-frontend-prod
-          servicePort: 8000
\ No newline at end of file
+          servicePort: 8000
+
+
+# Ingress description
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: baseline-prod-ingress
+  namespace: baseline-environment
+  annotations:
+    kubernetes.io/ingress.class: "traefik"
+spec:
+  rules:
+  - host: baseline.k8s.semprod.local
+    http:
+      paths:
+      - backend:
+          service:
+            name: baseline-frontend-prod
+            port:
+              number: 8000
+        path: /
+        pathType: ImplementationSpecific
+  - host: baseline.semapp.de
+    http:
+      paths:
+      - backend:
+          service:
+            name: baseline-frontend-prod
+            port:
+              number: 8000
+        path: /
+        pathType: ImplementationSpecific
\ No newline at end of file
diff --git a/02_hetzner/03_baseline/keycloak/deployment.yaml b/02_hetzner/03_baseline/keycloak/deployment.yaml
new file mode 100644
index 0000000..d719c66
--- /dev/null
+++ b/02_hetzner/03_baseline/keycloak/deployment.yaml
@@ -0,0 +1,90 @@
+---
+  apiVersion: "apps/v1"
+  kind: "Deployment"
+  metadata: 
+    name: "keycloak"
+    namespace: "baseline-environment"
+  spec: 
+    selector: 
+      matchLabels: 
+        app: "keycloak"
+    replicas: 1
+    template: 
+      metadata: 
+        labels: 
+          app: "keycloak"
+      spec: 
+        containers: 
+          - name: "keycloak-prod"
+            image: "jboss/keycloak"
+            resources:
+              requests:
+                memory: "512Mi"
+                cpu: "100m"
+              limits:
+                memory: "1Gi"
+                cpu: "4"
+            imagePullPolicy: "Always"
+            env: 
+              - name: "KEYCLOAK_USER"
+                value: "admin" 
+              - name: "KEYCLOAK_PASSWORD"
+                value: "admin"
+              - name: DB_VENDOR
+                value: postgres
+              - name: DB_ADDR
+                value: psql.semprod.local
+              - name: DB_DATABASE
+                value: keycloak_db
+              - name: DB_USER
+                value: keycloak
+              - name: DB_PASSWORD
+                value: e7ov7xx45qr1erk9
+            ports: 
+              - name: keycloak-http
+                containerPort: 8080
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: keycloak-srv
+  namespace: baseline-environment
+spec:
+  selector:
+    app: keycloak
+  ports:
+    - name: keycloak-http
+      port: 8080
+      targetPort: keycloak-http
+  type: NodePort
+
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: keycloak-ingress
+  namespace: baseline-environment
+  annotations:
+    kubernetes.io/ingress.class: "traefik"
+spec:
+  rules:
+  - host:  keycloak.k8s.semprod.local
+    http:
+      paths:
+      - backend:
+          service:
+            name: keycloak-srv
+            port:
+              number: 8080
+        path: /
+        pathType: ImplementationSpecific
+  - host: keycloak.semprod.local
+    http:
+      paths:
+      - backend:
+          service:
+            name: keycloak-srv
+            port:
+              number: 8080
+        path: /
+        pathType: ImplementationSpecific
\ No newline at end of file