diff --git a/dashboard/prod/dashboard.yaml b/dashboard/prod/dashboard.yaml
new file mode 100644
index 0000000..3e58495
--- /dev/null
+++ b/dashboard/prod/dashboard.yaml
@@ -0,0 +1,71 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: dashboard
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dashboard-service
+  namespace: dashboard
+spec:
+  ports:
+  - port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: dashboard
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: dashboard
+  name: dashboard-deployment
+  namespace: dashboard
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: dashboard
+  template:
+    metadata:
+      labels:
+        app: dashboard
+    spec:
+      containers:
+      - image: git.ar21.de/yolokube/dashboard:94
+        imagePullPolicy: Always
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 8080
+          initialDelaySeconds: 4
+          periodSeconds: 3
+        name: dashboard
+        ports:
+        - containerPort: 8080
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    kubernetes.io/tls-acme: "true"
+  name: dashboard-ingress
+  namespace: dashboard
+spec:
+  rules:
+  - host: dashboard.services.yolokube.de
+    http:
+      paths:
+      - backend:
+          service:
+            name: dashboard-service
+            port:
+              number: 80
+        path: /
+        pathType: Prefix
+  tls:
+  - hosts:
+    - dashboard.services.yolokube.de
+    secretName: dashboard-tls-key
diff --git a/dashboard/staging/dashboard.yaml b/dashboard/staging/dashboard.yaml
new file mode 100644
index 0000000..3d4034c
--- /dev/null
+++ b/dashboard/staging/dashboard.yaml
@@ -0,0 +1,71 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: dashboard-staging
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dashboard-service
+  namespace: dashboard-staging
+spec:
+  ports:
+  - port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: dashboard
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: dashboard
+  name: dashboard-deployment
+  namespace: dashboard-staging
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dashboard
+  template:
+    metadata:
+      labels:
+        app: dashboard
+    spec:
+      containers:
+      - image: git.ar21.de/yolokube/dashboard:staging-93
+        imagePullPolicy: Always
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 8080
+          initialDelaySeconds: 4
+          periodSeconds: 3
+        name: dashboard
+        ports:
+        - containerPort: 8080
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    kubernetes.io/tls-acme: "true"
+  name: dashboard-ingress
+  namespace: dashboard-staging
+spec:
+  rules:
+  - host: dashboard-staging.services.yolokube.de
+    http:
+      paths:
+      - backend:
+          service:
+            name: dashboard-service
+            port:
+              number: 80
+        path: /
+        pathType: Prefix
+  tls:
+  - hosts:
+    - dashboard-staging.services.yolokube.de
+    secretName: dashboard-tls-key
diff --git a/loki/values.yaml b/loki/values.yaml
index 61a42d4..7d34c73 100644
--- a/loki/values.yaml
+++ b/loki/values.yaml
@@ -11,9 +11,11 @@ loki:
         index:
           prefix: index_
           period: 24h
+  limits_config:
+    retention_period: 24h
   compactor:
     compaction_interval: 15m
-    retention_enabled: false
+    retention_enabled: true
     retention_delete_delay: 1h
     retention_delete_worker_count: 150
     delete_request_store: s3