diff --git a/.cspell.json b/.cspell.json
index ce726e4f7..48bbad431 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -7,12 +7,15 @@
     "ABDEFHIJZ",
     "aspinu",
     "vultr",
+    "behaviour",
     "OVHcloud",
     "CISA",
     "minikube",
     "cloudnativepg",
     "srodenhuis",
     "Traefik",
+    "rbaumgar",
+    "ebpf",
     "minio",
     "Alin",
     "petclinc",
diff --git a/docs/apps/drone.md b/docs/apps/drone.md
index 9acf36ee7..3b21e6d6d 100644
--- a/docs/apps/drone.md
+++ b/docs/apps/drone.md
@@ -4,31 +4,6 @@ title: Drone
 sidebar_label: Drone
 ---
 
-Otomi uses Drone to deploy changes from the values repo. As such, it is installed and configured by default. When no source control is configured, Otomi will deploy Gitea as Drone's git hosting dependency.
-
-You may use Otomi's Drone for other purposes if desired.
-
-## Configuration values
-
-### Source control
-
-Configure Drone to use another Git repository for `otomi-values`. The following sGit services are supported:
-
-- Bitbucket cloud
-- Bitbucket server
-- Gitea (external)
-- Git hub
-- Git lab
-- Gogs
-
-### Debug
-
-Turns on debugging in Drone.
-
-### Tracing
-
-Turns on tracing in Drone
-
-### Resources
-
-Adjust default provided resource requests and limits for Drone Runner, Drone Server and Drone Agent
\ No newline at end of file
+:::info
+Drone has been deprecated. We advise to use Tekton if you would need to create custom CI/CD pipelines
+:::
\ No newline at end of file
diff --git a/docs/apps/external-dns.md b/docs/apps/external-dns.md
index 8f3659e7d..ac8d76043 100644
--- a/docs/apps/external-dns.md
+++ b/docs/apps/external-dns.md
@@ -9,9 +9,5 @@ External-dns is required to make public service domains accessible by registerin
 The use of external-dns is a prerequisite for using the following features:
 
 - Harbor private registries for teams
-- Builds (rely on Harbor)
-- Projects (rely on Harbor)
-
-## Configuration values
-
-External-dns can be configured in the [DNS section](/docs/for-ops/console/settings/dns) of the Platform Setting
\ No newline at end of file
+- Builds (relies on Harbor)
+- Projects (relies on Harbor)
\ No newline at end of file
diff --git a/docs/apps/falco.md b/docs/apps/falco.md
index a64bb7a0f..81556f118 100644
--- a/docs/apps/falco.md
+++ b/docs/apps/falco.md
@@ -4,19 +4,22 @@ title: Falco
 sidebar_label: Falco
 ---
 
-Falco can be used for thread detection. When turned on
-
-:::Notes:
-Your deployed workloads may trigger one or more Falco rules. Hence, you may want to reconfigure some of the defaults. Something you consider as normal can be whitelisted in the Raw values of the Falco application.
-:::
+Falco can be used for thread detection. Before activating Falco, please first check which [Driver](https://falco.org/docs/event-sources/kernel/) to use. If you know which driver should be selected, activate Falco, go to the `Values`, select the `Driver` and submit changes. No `Deploy Changes`
 
 ## Configuration values
-### Falco sidekick configuration
 
-- Number of replica's of Falco Sidekick
-- Minimum priority (default is informational).
+### Driver settings
+
+Select the driver to use:
+
+- module
+- ebpf (default)
+- modern-bpf
 
 ### Resources
 
-Adjust default provided resource requests and limits for Falco, Falco Sidekick and Falco Exporter.
+Adjust default provided resource requests and limits for Falco and Falco Exporter.
+
+## Raw values
 
+When Falco is installed, Otomi will add a set of rules to `white-list` all known behaviour. These rules are added using the Raw Values. 
\ No newline at end of file
diff --git a/docs/apps/otel.md b/docs/apps/otel.md
index 4601b512e..0d81e4db0 100644
--- a/docs/apps/otel.md
+++ b/docs/apps/otel.md
@@ -4,4 +4,4 @@ title: Open Telemetry Operator
 sidebar_label: Open Telemetry Operator
 ---
 
-OpenTelemetry Operator is used to create a OTEL Collector to receive telemetry data from Istio and Nginx Ingress (and applications configured with Instrumentation) and export this data to the Tempo backend. Grafana can then be used to see the full traces.
\ No newline at end of file
+OpenTelemetry Operator is used to create an OTEL Collector to receive telemetry data from Istio and Nginx Ingress (and applications configured with Instrumentation) and export this data to the Tempo backend. Grafana can then be used to see traces.
\ No newline at end of file
diff --git a/docs/apps/thanos.md b/docs/apps/thanos.md
index 2771e71af..ed12b60f4 100644
--- a/docs/apps/thanos.md
+++ b/docs/apps/thanos.md
@@ -4,4 +4,4 @@ title: Thanos
 sidebar_label: Thanos
 ---
 
-Thanos can be enabled for multi-cluster long term metrics retention.
\ No newline at end of file
+Thanos can be enabled for multi-cluster metrics retention using an off-site object storage service.
\ No newline at end of file
diff --git a/docs/apps/vault.md b/docs/apps/vault.md
index 5be349326..57b15f2c2 100644
--- a/docs/apps/vault.md
+++ b/docs/apps/vault.md
@@ -5,7 +5,7 @@ sidebar_label: Hashicorp Vault
 ---
 
 :::note
-Hashicorp Vault is being deprecated in Otomi. We are going to replace this app with solution based on SealedSecrets.
+Hashicorp Vault is being deprecated. The Otomi Secrets feature is soon going to be based on SealedSecrets.
 :::
 
 HashiCorp Vault is a shared application for securely storing and managing secrets. Read more about Vault [here](https://www.vaultproject.io/docs/what-is-vault).
diff --git a/docs/for-devs/console/catalog.md b/docs/for-devs/console/catalog.md
new file mode 100644
index 000000000..b1e0a8894
--- /dev/null
+++ b/docs/for-devs/console/catalog.md
@@ -0,0 +1,50 @@
+---
+slug: catalog
+title: Otomi Catalog
+sidebar_label: Otomi Catalog
+---
+
+The Catalog is a library of curated Helm charts to create Kubernetes resources. By default the Catalog contains a set of Helm charts provided by Otomi to get started quickly, but they can also be modified depending on your requirements or be removed from the Catalog. 
+
+The contents of the Catalog and the RBAC configuration (which Team can use which Helm chart) are managed by the platform administrator. Contact the platform administrator if you would like to add your own charts to use within your Team.
+
+## About Otomi Catalog quick starts
+
+The Catalog contains a set of Helm charts that can be used as quick starts. The following quick starts are available:
+
+### k8s-deployment
+
+The `otomi-quickstart-k8s-deployment` Helm chart can be used to create a Kubernetes `Deployment` (to deploy a single image), a `Service` and a `ServiceAccount`. Optionally a `HorizontalPodAutoscaler`, a Prometheus `ServiceMonitor` and a `Configmap` can be created.
+
+### k8s-deployment-otel
+
+The `otomi-quickstart-k8s-deployment-otel` Helm chart can be used to create a Kubernetes `Deployment` (to deploy a single image), a `Service`, a `ServiceAccount`, an `OpenTelemetryCollector` and an `Instrumentation`. Optionally a `HorizontalPodAutoscaler`, a Prometheus `ServiceMonitor` and a `Configmap` can be created.
+
+### k8s-deployments-canary
+
+The `otomi-quickstart-k8s-deployments-canary` Helm chart can be used to create 2 Kubernetes `Deployments` (to deploy 2 versions of an image), a `Service` and a `ServiceAccount`. Optionally a `HorizontalPodAutoscaler`, a Prometheus `ServiceMonitor` and a `Configmap` (for each version) can be created.
+
+### knative-service
+
+The `otomi-quickstart-knative-service` Helm chart can be used to create a Knative `Service` (to deploy a single image), a `Service` and a  `ServiceAccount`. Optionally a Prometheus `ServiceMonitor` can be created.
+
+
+## Using the Catalog
+
+1. Click on `Catalog` in the left menu
+
+2. You will now see all the templates that are available to use
+
+![catalog](../../img/catalog-1.png)
+
+3. Click on the `k8s-deployment` template
+
+![catalog](../../img/catalog-2.png)
+
+In the Info tab you'll see some information about the Chart like the version and additional instructions.
+
+3. Click on the `Values` tab
+
+![catalog](../../img/catalog-3.png)
+
+4. Continue to [create a workload](workloads.md)
diff --git a/docs/for-devs/console/workloads.md b/docs/for-devs/console/workloads.md
index 856a99150..b25f9d776 100644
--- a/docs/for-devs/console/workloads.md
+++ b/docs/for-devs/console/workloads.md
@@ -29,9 +29,9 @@ Before creating a workload from the developer catalog, we'll need the `repositor
 
 2. Go to `Workloads` in the left menu and click on `New Workload`
 
-3. Add a `Name` for the workload
+3. Select a template from the catalog to use
 
-4. Select a template from the catalog to use
+4. Add a `Name` for the workload
 
 5. (Optional) Configure the `Auto image updater`. Default is `Disabled`.
 
diff --git a/docs/for-devs/get-started/lab-1.md b/docs/for-devs/get-started/lab-1.md
index 1695ea11a..4a5d3e5a6 100644
--- a/docs/for-devs/get-started/lab-1.md
+++ b/docs/for-devs/get-started/lab-1.md
@@ -6,9 +6,13 @@ sidebar_label: Prerequisites
 
 Welcome to Otomi! If you are a developer and are going to use Otomi, this getting started guide is for you. In this first part we are going to make sure everything is ready to get started.
 
+## Prerequisites
+
 We assume the platform administrator has:
 
-1. Activated the following applications:
+1. Installed Otomi with DNS configured
+
+2. Activated the following applications:
 
 - Harbor
 - ArgoCD
@@ -18,11 +22,11 @@ We assume the platform administrator has:
 - Trivy Operator
 - Gatekeeper (with option `Disable validating webhook` set to true)
 
-For the [Use OpenTelemery](lab-27) Lab, the Tempo app needs to be enabled together with tracing at `Istio` and `Nginx Ingress` apps.
+For the [Use OpenTelemery](lab-27) Lab, the Tempo app needs to be enabled together with tracing in the `Istio` and `Nginx Ingress` apps.
 
-1. Created a team called `demo`
-2. [Created an account](/docs/apps/keycloak#create-a-user-in-keycloak) and added your user the team group in Keycloak
-3. Provided you with the following information:
+3. Created a team called `demo` with `Managed prometheus and alert manager` enabled
+4. [Created an account](/docs/apps/keycloak#create-a-user-in-keycloak) and added your user to the team group in Keycloak
+5. Provided you with the following information:
 
 - The URL to access the Otomi web UI (Otomi Console)
 - Your login credentials
@@ -36,4 +40,4 @@ When you have received the URL of the web UI and have a username/password, then
 
 After sign in, you will see this page:
 
-![Team apps](../../img/team-apps.png)
+![Team apps](../../img/team-apps.png)
\ No newline at end of file
diff --git a/docs/for-devs/get-started/lab-11.md b/docs/for-devs/get-started/lab-11.md
index 61414b9b5..a466f9b55 100644
--- a/docs/for-devs/get-started/lab-11.md
+++ b/docs/for-devs/get-started/lab-11.md
@@ -48,7 +48,7 @@ Now go to the [Expose services](lab-18) lab and expose the `green` service. When
 
 In the Trigger Builds lab we already created a Build called `green` and configured it with a trigger.
 
-Now go to the `green` repo in Gitea and change the color in the `green.html` to `orange`:
+Now go to the `green` repo in Gitea and change the the welcome message:
 
 ```html
 <!DOCTYPE html>
@@ -59,7 +59,7 @@ Now go to the `green` repo in Gitea and change the color in the `green.html` to
     <style>
       body {
         color: #ffffff;
-        background-color: orange
+        background-color: green
         font-family: Arial, sans-serif;
         font-size: 14px;
       }
@@ -79,7 +79,7 @@ Now go to the `green` repo in Gitea and change the color in the `green.html` to
   </head>
   <body>
     <div align="center">
-      <h1>Welcome to Orange</h1>
+      <h1>Welcome to the improved Green app</h1>
     </div>
   </body>
 </html>
@@ -87,6 +87,4 @@ Now go to the `green` repo in Gitea and change the color in the `green.html` to
 
 And commit changes.
 
-After the change has been committed, go to `Services` in the left menu and click on the Url of the `green` service. After a couple of minutes (note that the auto image update checks for changes every 2 minutes) you should see an `orange` page saying `Welcome to Orange`
-
-Now go to `Services` in the left menu and click on the Url of the `green` service. What do you see?
+After the change has been committed, go to `Services` in the left menu and click on the Url of the `green` service. After a couple of minutes (note that the auto image update checks for changes every 2 minutes) you should see a `green` page saying `Welcome to the improved Green app`
diff --git a/docs/for-devs/get-started/lab-13.md b/docs/for-devs/get-started/lab-13.md
index 330da4652..77f104bc2 100644
--- a/docs/for-devs/get-started/lab-13.md
+++ b/docs/for-devs/get-started/lab-13.md
@@ -4,25 +4,19 @@ title: Deploy workloads using Otomi
 sidebar_label: Create workloads
 ---
 
-In the previous lab we deployed a workload using Argo CD. In this lab we'll deploy a regular workload (a Kubernetes Deployment) using the Otomi Developer Catalog and Otomi Workload feature.
+In the previous lab we deployed a workload using Argo CD with a BYO manifest and we explored the Catalog. In this lab we'll create a workload (a Kubernetes Deployment) using the Catalog and the Workload feature.
 
-The Otomi Developer Catalog allows to store any Helm chart in the `otomi/charts` repository in Gitea. By deploying a given Helm chart from the catalog, Otomi saves the corresponding Helm chart values in a separate file in the `otomi/values` repo. Otomi configures Argo CD to observe the values and automatically deploy changes when values are adjusted (based on the GitOps principle).
+## Create a Workload from the Catalog
 
-## About the Developer Catalog
-
-The Developer Catalog in Otomi is a curated list of Helm charts that can be used in workloads to create Kubernetes resources. The catalog by default only contains a set of Otomi quick start Helm charts.
-
-## Create a Workload from the Developer Catalog
-
-Before creating a workload from the developer catalog, we'll need the `repository` and `tag` of the image to use. Go to the list of Builds and add the `repository` of the `blue` build to your clipboard. Remember that the tag is `latest`.
+Before creating a workload from the Catalog, we'll need the `repository` and `tag` of the image to use. Go to the list of Builds and add the `repository` of the `blue` build to your clipboard. Remember that the tag is `latest`.
 
 You can create a workload from the developer catalog:
 
-1. Go to `Workloads` in the left menu and click on `New Workload`
+1. Go to `Catalog` in the left menu and click on the `k8s-deployment`template
 
-2. Add the Name `blue` for the workload
+2. Click on `Values`
 
-3. Select `otomi-quickstart-k8s-deployment` from the catalog
+3. Add the Name `blue`
 
 4. Leave the `Auto image updater` to `Disabled`
 
@@ -34,10 +28,18 @@ image:
   tag: latest
 ```
 
-6. Click `Submit`
+![workloads](../../img/workloads-1.png)
+
+6. Click `Submit` and then `Deploy Changes`
+
+Otomi will now create all the needed Argo CD resources to deploy your workload. 
+
+7. Click on `Workloads` in the left menu. You will now see a list of all Workloads and there status:
+
+![workloads](../../img/workloads-2.png)
 
-Now click on `Deploy Changes`
+8. In the workloads list, click on the `Application` link of your workload to see the status of your workload in Argo CD:
 
-After a few minutes, Otomi will have created all the needed Argo CD resources to deploy your workload. In the workloads list, click on the `Application` link of your workload to see the status of your workload in Argo CD.
+![workloads](../../img/workloads-3.png)
 
-The values of a workload can be changed at any time. Changes will be deployed automatically.
+The values of a workload can be changed at any time. Changes will automatically be synchronized.
diff --git a/docs/for-devs/get-started/lab-22.md b/docs/for-devs/get-started/lab-22.md
index 2a7608cb4..d6b7a1021 100644
--- a/docs/for-devs/get-started/lab-22.md
+++ b/docs/for-devs/get-started/lab-22.md
@@ -4,9 +4,6 @@ title: Using custom metrics
 sidebar_label: Using custom metrics
 ---
 
-:::info
-Prometheus and Grafana need to be activated for this lab.
-:::
 ## What are custom metrics
 
 Prometheus will collect all kind of standard container metrics like CPU and memory usage, but no (custom) business or customer metrics like the number of customers who logged into your app each hour.
@@ -17,103 +14,104 @@ Instrumenting code means you write code to expose information about the technica
 
 In this guide we will not dive into the way how to instrument your code. We will assume you have a container that exposes custom metrics and will show how the custom metrics can be collected and analysed.
 
-:::info
-In this guide we assume that otomi is configured for multi-tenancy and that each Team in Otomi is provided with a dedicated Prometheus instance that will be used for collecting custom metrics only.
-:::
 
-## Deploy your container
+## Create a Workload
 
-For this lab we'll use a prometheus-dummy-exporter container from Google
+1. Go to the Catalog and click on the `k8s-deployment` template
 
-- Now go to your team's Git repo for Argo CD `(otomi/team-<name>-argocd)`
+2. Click on the `Values` tab
 
-- Create a new file in the repo called custom-metrics.yaml
-- Add the following contents to the file:
+3. Fill in the name `custom-metrics`
+
+4. Use the following values:
 
 ```yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: custom-metrics
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: custom-metrics
-  template:
-    metadata:
-      labels:
-        app: custom-metrics
-    spec:
-      containers:
-        - name: custom-metrics
-          image: us-docker.pkg.dev/google-samples/containers/gke/prometheus-dummy-exporter:v0.2.0
-          command: ["./prometheus-dummy-exporter"]
-          args:
-          - --metric-name=custom_prometheus
-          - --metric-value=40
-          - --port=8080
-          resources:
-            limits:
-              memory: '128Mi'
-              cpu: '200m'
-            requests:
-              memory: '64Mi'
-              cpu: '100m'
-          securityContext:
-            runAsUser: 1001
-          ports:
-            - name: metrics
-              containerPort: 8080
-              protocol: TCP
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: custom-metrics
-spec:
-  selector:
-    app: custom-metrics
-  ports:
-    - name: metrics
-      port: 8080
-      targetPort: 8080
-      protocol: TCP
----
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: custom-metrics
-  labels:
-    app: custom-metrics
-    prometheus: team-dev
-spec:
-  namespaceSelector:
-    matchNames:
-    - team-dev
-  selector:
-    matchLabels:
-      app: custom-metrics
+image:
+  repository: quay.io/rbaumgar/monitor-demo-app-jvm
+  pullPolicy: IfNotPresent
+  tag: latest
+containerPorts:
+  - name: web
+    containerPort: 8080
+    protocol: TCP
+servicePorts:
+  - port: 8080
+    targetPort: 8080
+    protocol: TCP
+    name: web
+resources:
+  limits:
+    cpu: 300m
+    memory: 128Mi
+  requests:
+    cpu: 100m
+    memory: 32Mi
+replicaCount: 1
+serviceMonitor:
+  create: true
   endpoints:
-  - port: metrics
-    path: /metrics
+    - interval: 30s
+      port: web
+      scheme: http
+      path: /q/metrics
+```
+
+5. Click `Submit` and then `Deploy Changes`
+
+## Check the status of the ServiceMonitor
+
+Check if the ServiveMonitor is now being scraped by Prometheus:
+
+1. In the left menu go to `Apps`
+
+2. Click on the `Prometheus` app
+
+3. In Prometheus, click on `Status` in the top menu and then click `Targets`
+
+4. You will now see that the ServiceMonitor has the `State` UP:
+
+![metrics](../../img/custom-metrics.png)
+
+Okay, our custom metrics are now being scraped by the Team's own Prometheus. Before we continue, let's first generate some load so we can see actual metrics;
+
+1. Go to the [Expose services](lab-18) lab and expose the `custom-metrics` service
+
+2. Run the following command in your terminal:
+
+```bash
+for i in {1..1000}; do curl https://custom-metrics-labs.<your-domain>/hello; sleep 10; done
 ```
 
-Note that the `ServiceMonitor` has a selector `prometheus: team-dev`. This is required to make sure the metrics are only collected by the team's private Prometheus instance.
+3. Wait for approximately 10 minutes
+
+## See the custom metrics
+
+To see the custom metrics:
+
+1. Open the `Prometheus` app
+
+2. In Prometheus, fill in the following Expression: `application_greetings_total`
 
+3. Click on `Graph`
 
-## Configure a Grafana dashboard
+4. You should now see the following:
 
-Configure a Grafana dashboard to analyse the custom metrics:
+![metrics](../../img/custom-metrics-1.png)
 
-- Open Grafana in the Team's apps
-- Go to the Grafana dashboard homepage
-- In the left-side navigation pane, choose + > Dashboard
-- On the New dashboard page, click Add new panel
-- On the New dashboard / Edit Panel
-- In the A collapsible section, select a metric from the Metrics drop-down list. In our example we use the `go_gc_duration_second_count_` metric
 
-You should now see something like this:
+## Next steps
 
-![Team apps](../../img/new-dashboard.png)
+Prometheus is now scraping our custom metrics. You can now use these metrics to:
+
+- Create a dashboard in Grafana in the lab [Create custom dashboards](lab-30)
+- Create rules and send alerts in the lab [Create custom rules](lab-31)
+
+## Things to be aware of
+
+In this lab we are using the `k8s-deployment` template. In this template the follow `label` is added:
+
+```yaml
+otomi.io/team: team-labs
+```
 
+This label is needed for the team's Prometheus to use the `ServiceMonitor` because of strict networkpolicies. If you would like to create you're own ServiceMonitors, them always add the `otomi.io/team` label to your pods!
\ No newline at end of file
diff --git a/docs/for-devs/get-started/lab-23.md b/docs/for-devs/get-started/lab-23.md
index 270a4895a..585fcbdd7 100644
--- a/docs/for-devs/get-started/lab-23.md
+++ b/docs/for-devs/get-started/lab-23.md
@@ -9,7 +9,8 @@ When your application is deployed, you would of course like to get an alert when
 ## Monitor your application for availability
 
 - [Create a Service](lab-7) for your app in Otomi. The service can have an Exposure ingress of type `Cluster` or `Ingress`
-- Open the Prometheus app in your apps
+
+- Open the Prometheus
 
 ![kubecfg](../../img/prometheus-teams.png)
 
diff --git a/docs/for-devs/get-started/lab-29.md b/docs/for-devs/get-started/lab-29.md
new file mode 100644
index 000000000..ed39c3e29
--- /dev/null
+++ b/docs/for-devs/get-started/lab-29.md
@@ -0,0 +1,47 @@
+---
+slug: lab-29
+title: Explore the Catalog
+sidebar_label: Explore the Catalog
+---
+
+In this lab we are going to explore the Catalog in Otomi. The Catalog is a library of curated Helm charts to create Kubernetes resources. By default the Catalog contains a set of Helm charts provided by Otomi to get started quickly, but they can also be modified depending on your requirements or be removed from the Catalog. The contents of the Catalog and the RBAC configuration (which Team can use which Helm chart) are managed by the platform administrator. Contact the platform administrator if you would like to add your own charts to use within your Team.
+
+## About Otomi Catalog quick starts
+
+The Catalog contains a set of Helm charts that can be used as quick starts. The following quick starts are available:
+
+### k8s-deployment
+
+The `otomi-quickstart-k8s-deployment` Helm chart can be used to create a Kubernetes `Deployment` (to deploy a single image), a `Service` and a `ServiceAccount`. Optionally a `HorizontalPodAutoscaler`, a Prometheus `ServiceMonitor` and a `Configmap` can be created.
+
+### k8s-deployment-otel
+
+The `otomi-quickstart-k8s-deployment-otel` Helm chart can be used to create a Kubernetes `Deployment` (to deploy a single image), a `Service`, a `ServiceAccount`, an `OpenTelemetryCollector` and an `Instrumentation`. Optionally a `HorizontalPodAutoscaler`, a Prometheus `ServiceMonitor` and a `Configmap` can be created.
+
+### k8s-deployments-canary
+
+The `otomi-quickstart-k8s-deployments-canary` Helm chart can be used to create 2 Kubernetes `Deployments` (to deploy 2 versions of an image), a `Service` and a `ServiceAccount`. Optionally a `HorizontalPodAutoscaler`, a Prometheus `ServiceMonitor` and a `Configmap` (for each version) can be created.
+
+### knative-service
+
+The `otomi-quickstart-knative-service` Helm chart can be used to create a Knative `Service` (to deploy a single image), a `Service` and a  `ServiceAccount`. Optionally a Prometheus `ServiceMonitor` can be created.
+
+## Using the Catalog
+
+1. Click on `Catalog` in the left menu
+
+2. You will now see all the templates that are available to use
+
+![catalog](../../img/catalog-1.png)
+
+3. Click on the `k8s-deployment` template
+
+![catalog](../../img/catalog-2.png)
+
+In the Info tab you'll see some information about the Chart like the version and additional instructions.
+
+3. Click on the `Values` tab
+
+![catalog](../../img/catalog-3.png)
+
+From here you can create a Workload using the Catalog template by adding a name and changing the values. Go to the [next lab](lab-13) to create a workload.
\ No newline at end of file
diff --git a/docs/for-devs/get-started/lab-3.md b/docs/for-devs/get-started/lab-3.md
index ebc574076..472b5175c 100644
--- a/docs/for-devs/get-started/lab-3.md
+++ b/docs/for-devs/get-started/lab-3.md
@@ -9,13 +9,15 @@ As a developer you'll need a Git repository for your code. Most organizations wi
 As a team member, you can create and manage your own repositories.
 
 :::info
-Otomi does not create a group in Gitea that contains all the team members. Team members first have to sign in to Gitea (using OpenID), after which they are automatically added to the correct team.
+Team members first have to sign in to Gitea (using OpenID), after which they are automatically added to the correct team.
 :::
 
 :::info
-The `otomi-admin` account is unable to login with OpenID, this account needs to login with the normal login form.
+The `otomi-admin` account is unable to login with OpenID, this account needs to login with the user/password login form.
 :::
 
+In these labs we'll be using a Team called `labs` and a user called `labs-user`.
+
 ## Create a private repository
 
 In the apps section in Otomi console, you'll see an app called Gitea. Click on it.
diff --git a/docs/for-devs/get-started/lab-30.md b/docs/for-devs/get-started/lab-30.md
new file mode 100644
index 000000000..3e6091fd2
--- /dev/null
+++ b/docs/for-devs/get-started/lab-30.md
@@ -0,0 +1,73 @@
+---
+slug: lab-30
+title: Create custom dashboards
+sidebar_label: Create custom dashboards
+---
+
+In the lab [Using custom metrics](lab-22) we created a Workload with a ServiceMonitor so the Team's Prometheus can scrape our custom metrics. In this lab we are going to create a custom Grafana dashboard and add the dashboard to a Configmap so the Team's Grafana will automatically load the dashboard.
+
+## Create a dashboard in Grafana
+
+1. In the left menu, click on `Apps` and open `Grafana`
+
+2. Go to the Grafana dashboard homepage
+
+3. In the top right click on `New` and then `New Dashboard`
+
+4. Click `+ Add visualization`
+
+5. In the `Query` tab select `Prometheus (default)`
+
+6. In the `A` collapsible section, select a metric from the `Metric` drop-down list. In our example we use the `application_greetings_total` metric
+
+7. Click `Run queries`
+
+8. You should now see a `Time series` graph like this:
+
+![dashboards](../../img/dashboards-1.png)
+
+9. Save the dashboard in Grafana
+
+## Make the dashboard persistent
+
+You know know how to create a dashboard in Grafana using custom metrics. You could now save the dashboard, but if Grafana would get re-started, the dashboard would be gone. To make the dashboard persistent we need to add it to a configmap.
+
+1. Go to `apps` and open `Gitea`
+
+2. In the list of repositories there is a repository called `otomi/team-<team-name>-argocd`. Go to this repository.
+
+3. Click `Add File` and then `New File`
+
+4. Name the file `my-custom-dashboard.yaml`
+
+5. Add the following manifest to the file:
+
+```yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: my-custom-dashboard
+  labels:
+    grafana_dashboard: "1"
+    release: grafana-dashboards-labs # change labs to the name of your team
+data:
+  my-dashboard.json: |-
+    # paste your dashboard json here
+```
+
+6. Before commiting changes, go back to Grafana
+
+7. Click on `Dashboard settings` (in the top right)
+
+8. In the left menu click `JSON model`
+
+9. Copy the JSON model and paste it into the ConfigMap. Make sure to indent with 4
+
+11. Delete the dashboard created in Grafana
+
+10. Commit changes in Gitea
+
+The dashboard will now automatically be loaded into Grafana.
+
+
+
diff --git a/docs/for-devs/get-started/lab-31.md b/docs/for-devs/get-started/lab-31.md
new file mode 100644
index 000000000..752cb494d
--- /dev/null
+++ b/docs/for-devs/get-started/lab-31.md
@@ -0,0 +1,66 @@
+---
+slug: lab-31
+title: Create custom rules
+sidebar_label: Create custom rules
+---
+
+Now we are exporting metrics, these metrics can also be used to generate alerts. To generate alerts, we first need to create a Prometheus `Rule`:
+
+1. Go to `apps` and open `Gitea`
+
+2. In the list of repositories there is a repository called `otomi/team-<team-name>-argocd`. Go to this repository.
+
+3. Click `Add File` and then `New File`
+
+4. Name the file `my-custom-rules.yaml`
+
+5. Add the following manifest to the file:
+
+```yaml
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  labels:
+    prometheus: team-labs # change labs to the name of your team
+  name: labs-custom-rules
+spec:
+  groups:
+  - name: custom.rules
+    rules:
+    - alert: 50GreetingsReached
+      annotations:
+        description: We reached 50 greetings!
+        summary: The number of greetings has reached more than 50.
+      expr: application_greetings_total > 50
+      for: 1m
+      labels:
+        severity: warning
+```
+
+6. Commit changes in Gitea
+
+## See rules in Prometheus
+
+Now let's check to see if Prometheus has picked-up the rule:
+
+1. Go to `Apps` and open `Prometheus`
+
+2. In the menu click on `Status` and then `Rules`. You should now see the rule:
+
+![rules](../../img/rules-1.png)
+
+3. In the menu in Prometheus, click `Alerts`
+
+4. You should see an alert has been fired:
+
+![rules](../../img/rules-2.png)
+
+## See alerts in Alertmanager
+
+1. Go to `Apps` and open `Alertmanager`
+
+2. You will see Alertmanager has received the alerts from Prometheus:
+
+![rules](../../img/rules-3.png)
+
+If a receiver has been configured for the Team, like Slack or email, then you would also have received a message with the alert.
\ No newline at end of file
diff --git a/docs/for-devs/get-started/overview.md b/docs/for-devs/get-started/overview.md
index aaff6a2c9..b57ed6f7c 100644
--- a/docs/for-devs/get-started/overview.md
+++ b/docs/for-devs/get-started/overview.md
@@ -1,12 +1,12 @@
 ---
 slug: overview
-title: Get started with Otomi for Developers Labs
+title: Get started with Otomi Labs
 sidebar_label: Get Started Labs
 ---
 
-**Otomi getting started labs for developers**
+**Otomi get started labs**
 
-Welcome to Otomi! If you are a developer and are going to use Otomi, these getting started labs are for you. Step by step we'll guide you in using Otomi to deploy and manage your containerized applications. The getting started with Otomi for developers contains a set of labs to cover the most common developer activities.
+Welcome to Otomi! If you are going to use Otomi, these getting started labs are for you. Step by step we'll guide you in using Otomi to build, deploy and manage your containerized applications. The getting started with Otomi contains a set of labs to cover the most common activities performed by developer- and/or DevOps teams.
 
 ---
 
@@ -33,6 +33,8 @@ Welcome to Otomi! If you are a developer and are going to use Otomi, these getti
 
 ### [BYO manifest to create a workload](lab-10)
 
+### [Explore the Catalog](lab-29)
+
 ### [Create a workload using the developer catalog](lab-13)
 
 ### [Configure the auto image updater](lab-11)
@@ -65,7 +67,11 @@ Welcome to Otomi! If you are a developer and are going to use Otomi, these getti
 
 ### [View container metrics](lab-21)
 
-### [Monitor custom metrics](lab-22)
+### [Using custom metrics](lab-22)
+
+### [Create custom dashboards](lab-30)
+
+### [Create custom rules](lab-31)
 
 ### [Monitoring availability](lab-23)
 
diff --git a/docs/for-ops/console/builds.md b/docs/for-ops/console/builds.md
index ef2a0c5a9..7636ed7bf 100644
--- a/docs/for-ops/console/builds.md
+++ b/docs/for-ops/console/builds.md
@@ -10,13 +10,14 @@ To enable this feature, first make sure [Harbor](../../apps/harbor.md) and [Tekt
 
 All known Builds on the platform are listed here. Builds can be sorted based on:
 
-| Property      | Description                                            |
-| ------------- | ------------------------------------------------------ |
-| Name         | The name of the build                                  |
-| Type          | Type of the build. Buildpacks or Docker                |
-| Webhook url   | The webhook URL if a trigger is configured for the build  |
+| Property      | Description                                                     |
+| ------------- | --------------------------------------------------------------- |
+| Name          | The name of the build                                           |
+| Type          | Type of the build. Buildpacks or Docker                         |
+| Webhook url   | The webhook URL if a trigger is configured for the build        |
 | Tekton        | Link to the `PipelineRun`` of the build in the Tekton dashboard |
-| Repository    | The repository of the image 
-| Team          | The name of the Team responsible for the build         |
+| Repository    | The repository of the image                                     |
+| Tag           | The tag of the image                                            |
+| Team          | The name of the Team responsible for the build                  |
 
 A platform admin can also create builds. Make sure to select the correct context (team-name) in the top bar. See [here](/docs/for-devs/console/builds) for more information about creating builds.
\ No newline at end of file
diff --git a/docs/for-ops/console/catalog.md b/docs/for-ops/console/catalog.md
new file mode 100644
index 000000000..692754246
--- /dev/null
+++ b/docs/for-ops/console/catalog.md
@@ -0,0 +1,11 @@
+---
+slug: catalog
+title: Otomi Catalog
+sidebar_label: Otomi Catalog
+---
+
+The Catalog is a library of curated Helm charts to create Kubernetes resources. By default the Catalog contains a set of Helm charts provided by Otomi to get started quickly, but they can also be modified depending on your requirements or be removed from the Catalog. 
+
+The contents of the Catalog and the RBAC configuration (which Team can use which Helm chart) are managed by the platform administrator. Contact the platform administrator if you would like to add your own charts to use within your Team.
+
+
diff --git a/docs/for-ops/how-to/dev-catalog.md b/docs/for-ops/how-to/dev-catalog.md
deleted file mode 100644
index f903acae6..000000000
--- a/docs/for-ops/how-to/dev-catalog.md
+++ /dev/null
@@ -1,67 +0,0 @@
----
-slug: dev-catalog
-title: Managing the Developer Catalog
-sidebar_label: Manage Developer Catalog
----
-
-Otomi offers a Developer Catalog to provide golden path templates (Helm charts) to developers. This is how it works:
-
-- Add a Helm chart to the `otomi/charts` repo in the local Gitea
-- Configure who can use the chart
-- Teams can create Workloads in Otomi using the provided charts
-
-After Otomi is installed, the catalog (the `otomi/charts` repo) will contain a set of quick start Helm charts. Tbe The Otomi provided Helm charts are not mandetory to use and can be removed or modified to your own liking. They are only provided to make it easier to get started.
-
-## Otomi quick start Helm charts
-
-When Otomi is installed, the catalog will contain the following Otomi quick start templates:
-
-### otomi-quickstart-k8s-deployment
-
-The `otomi-quickstart-k8s-deployment` chart can be used to create a Kubernetes `Deployment`. Optionally a `HPA` and a `Service Monitor` can be created.
-
-### otomi-quickstart-k8s-deployment-otel
-
-The `otomi-quickstart-k8s-deployment-otel` chart can be used to create a Kubernetes `Deployment` with Open Telemetry `instrumentation`.
-
-### otomi-quickstart-k8s-deployments-canary
-
-The `otomi-quickstart-k8s-deployments-canary` chart can be used to create 2 Kubernetes `Deployments` to deploy 2 versions of an image and use the `Traffic Control` feature in Otomi to do canary or blue/green deployments.
-
-### otomi-quickstart-knative-service
-
-The `otomi-quickstart-knative-service` chart can be used to create a Knative service with a scale to zero configuration.
-
-## Customize the catalog
-
-The Otomi provided charts are not mandetory to use and can be removed or modified to your own liking. They are only provided to make it easier to get started. To manage the catalog, just pull the `otomi/charts` repo, add the Helm charts you would like to make available and push changes. A newly added chart will immediately become available in the catalog for Teams to use.
-
-## Configure chart access
-
-For charts to become available for Teams to use, Teams need to be given access to use a chart. The catalog supports the following access options:
-
-### Everybody
-
-If a chart can be used by all teams, including the `team-admin` Team, add the following to the `Chart.yaml` of the chart:
-
-```yaml
-teams:
-    - all
-```
-
-### Specific teams
-
-If a chart is only allowed to be used by one or more specific teams, add the following to the `Chart.yaml` of the chart:
-
-```yaml
-teams:
-    - team-demo
-    - team-hello
-```
-
-To allow a chart to be used by the `team-admin` only, add the following to the `Chart.yaml` of the chart:
-
-```yaml
-teams:
-    - team-admin
-```
\ No newline at end of file
diff --git a/docs/for-ops/how-to/use-catalog.md b/docs/for-ops/how-to/use-catalog.md
new file mode 100644
index 000000000..680de6d49
--- /dev/null
+++ b/docs/for-ops/how-to/use-catalog.md
@@ -0,0 +1,69 @@
+---
+slug: dev-catalog
+title: Managing the Developer Catalog
+sidebar_label: Manage Developer Catalog
+---
+
+Otomi offers a Catalog to Teams on the platform to offer them golden path templates (Helm charts). This is how it works:
+
+- Add a Helm chart to the `otomi/charts` repo in the local Gitea
+- Configure which Teams can use the chart
+- Teams can create Workloads from the Catalog
+
+After Otomi is installed, the catalog (the `otomi/charts` repo) will contain a set of quick start Helm charts. Tbe The Otomi provided Helm charts are not mandetory to use and can be removed or modified to your own liking. They are only provided to make it easier to get started.
+
+## Otomi quick start Helm charts
+
+The Catalog contains a set of Helm charts that can be used as quick starts. The following quick starts are available:
+
+### k8s-deployment
+
+The `otomi-quickstart-k8s-deployment` Helm chart can be used to create a Kubernetes `Deployment` (to deploy a single image), a `Service` and a `ServiceAccount`. Optionally a `HorizontalPodAutoscaler`, a Prometheus `ServiceMonitor` and a `Configmap` can be created.
+
+### k8s-deployment-otel
+
+The `otomi-quickstart-k8s-deployment-otel` Helm chart can be used to create a Kubernetes `Deployment` (to deploy a single image), a `Service`, a `ServiceAccount`, an `OpenTelemetryCollector` and an `Instrumentation`. Optionally a `HorizontalPodAutoscaler`, a Prometheus `ServiceMonitor` and a `Configmap` can be created.
+
+### k8s-deployments-canary
+
+The `otomi-quickstart-k8s-deployments-canary` Helm chart can be used to create 2 Kubernetes `Deployments` (to deploy 2 versions of an image), a `Service` and a `ServiceAccount`. Optionally a `HorizontalPodAutoscaler`, a Prometheus `ServiceMonitor` and a `Configmap` (for each version) can be created.
+
+### knative-service
+
+The `otomi-quickstart-knative-service` Helm chart can be used to create a Knative `Service` (to deploy a single image), a `Service` and a  `ServiceAccount`. Optionally a Prometheus `ServiceMonitor` can be created.
+
+## Customize the catalog
+
+The Otomi provided charts are not mandetory to use and can be removed or modified to your own liking. They are only provided to make it easier to get started. To manage the catalog, just pull the `otomi/charts` repo, add the Helm charts you would like to make available and push changes. A newly added chart will immediately become available in the catalog for Teams to use.
+
+## Configure chart access
+
+For charts to become available for Teams to use, Teams need to be given access to use a chart. The catalog supports the following access options:
+
+### Everybody
+
+If a chart can be used by all teams, including the `team-admin` Team, add the following to the `rbac.yaml` in the root of the `otomi/charts` repository:
+
+```yaml
+rbac:
+  chart-name: null
+```
+
+### Specific teams
+
+If a chart is only allowed to be used by one or more specific teams, add the following to the `rbac.yaml`:
+
+```yaml
+rbac:
+  chart-name:
+    - team-demo
+    - team-hello
+```
+
+To allow a chart to be used by the `team-admin` only, add the following to the `rbac.yaml`:
+
+```yaml
+rbac:
+  chart-name:
+    - team-admin
+```
\ No newline at end of file
diff --git a/docs/img/catalog-1.png b/docs/img/catalog-1.png
new file mode 100644
index 000000000..5a79a2819
Binary files /dev/null and b/docs/img/catalog-1.png differ
diff --git a/docs/img/catalog-2.png b/docs/img/catalog-2.png
new file mode 100644
index 000000000..7b10132d4
Binary files /dev/null and b/docs/img/catalog-2.png differ
diff --git a/docs/img/catalog-3.png b/docs/img/catalog-3.png
new file mode 100644
index 000000000..16795f5a3
Binary files /dev/null and b/docs/img/catalog-3.png differ
diff --git a/docs/img/custom-metrics-1.png b/docs/img/custom-metrics-1.png
new file mode 100644
index 000000000..f41817b7c
Binary files /dev/null and b/docs/img/custom-metrics-1.png differ
diff --git a/docs/img/custom-metrics.png b/docs/img/custom-metrics.png
new file mode 100644
index 000000000..db9e85eb3
Binary files /dev/null and b/docs/img/custom-metrics.png differ
diff --git a/docs/img/dashboards-1.png b/docs/img/dashboards-1.png
new file mode 100644
index 000000000..55473e766
Binary files /dev/null and b/docs/img/dashboards-1.png differ
diff --git a/docs/img/rules-1.png b/docs/img/rules-1.png
new file mode 100644
index 000000000..7b2d19da7
Binary files /dev/null and b/docs/img/rules-1.png differ
diff --git a/docs/img/rules-2.png b/docs/img/rules-2.png
new file mode 100644
index 000000000..7b73121bc
Binary files /dev/null and b/docs/img/rules-2.png differ
diff --git a/docs/img/rules-3.png b/docs/img/rules-3.png
new file mode 100644
index 000000000..f588e8986
Binary files /dev/null and b/docs/img/rules-3.png differ
diff --git a/docs/img/workloads-1.png b/docs/img/workloads-1.png
new file mode 100644
index 000000000..9113e53e7
Binary files /dev/null and b/docs/img/workloads-1.png differ
diff --git a/docs/img/workloads-2.png b/docs/img/workloads-2.png
new file mode 100644
index 000000000..1457fb31e
Binary files /dev/null and b/docs/img/workloads-2.png differ
diff --git a/docs/img/workloads-3.png b/docs/img/workloads-3.png
new file mode 100644
index 000000000..b3836f539
Binary files /dev/null and b/docs/img/workloads-3.png differ
diff --git a/sidebar-docs.js b/sidebar-docs.js
index 27159c710..540f52e1e 100644
--- a/sidebar-docs.js
+++ b/sidebar-docs.js
@@ -27,7 +27,7 @@ module.exports = {
       "get-started/activation",
       "for-devs/get-started/overview",
     ],
-    "For Ops": [
+    "For Platform Admins": [
       {
         "Otomi Console": [
           "for-ops/console/overview",
@@ -63,7 +63,7 @@ module.exports = {
       {
         "How To": [
           "for-ops/how-to/overview",
-          "for-ops/how-to/dev-catalog",
+          "for-ops/how-to/use-catalog",
           "for-ops/how-to/ingress-classes",
           "for-ops/how-to/use-team-admin",
           "for-ops/how-to/core-only",
@@ -111,10 +111,11 @@ module.exports = {
         ],
       },
     ],
-    "For Devs": [
+    "For Team Members": [
       {
         "Otomi Console": [
           "for-devs/console/apps",
+          "for-devs/console/catalog",
           "for-devs/console/shortcuts",
           "for-devs/console/projects",
           "for-devs/console/builds",
@@ -133,6 +134,7 @@ module.exports = {
           "for-devs/get-started/lab-26",
           "for-devs/get-started/lab-8",
           "for-devs/get-started/lab-10",
+          "for-devs/get-started/lab-29",
           "for-devs/get-started/lab-13",
           "for-devs/get-started/lab-11",
           "for-devs/get-started/lab-24",
@@ -144,6 +146,8 @@ module.exports = {
           "for-devs/get-started/lab-20",
           "for-devs/get-started/lab-21",
           "for-devs/get-started/lab-22",
+          "for-devs/get-started/lab-30",
+          "for-devs/get-started/lab-31",
           "for-devs/get-started/lab-23",
           "for-devs/get-started/lab-25",
           "for-devs/get-started/lab-27",