diff --git a/Makefile b/Makefile
index 8b747042..8d0aab42 100644
--- a/Makefile
+++ b/Makefile
@@ -77,3 +77,8 @@ golib: golib-clean
 admin: 
 	echo '{"schema_id":"default", "traits": {"email":"a@pollex.nl"}}' | http post 127.0.0.1:4434/admin/identities | jq .id | \
 	 xargs -I uid echo '{"identity_id":"uid"}' | http post 127.0.0.1:4434/admin/recovery/code
+
+oathkeeper:
+	-@mkdir -p $(CURDIR)/tools/oathkeeper
+	@docker run --rm --init -v $(CURDIR):/project redocly/cli bundle /project/tools/openapi/api.yaml > $(CURDIR)/tools/oathkeeper/bundled_openapi.yaml
+	@openkeeper generate --config $(CURDIR)/tools/oathkeeper/openkeeper.toml > $(CURDIR)/tools/oathkeeper/generated_rules.json
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 61e79ff2..f1bc8d64 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -19,7 +19,10 @@ services:
     environment:
     - STATIC_PATH=services/dashboard/static
     - HTTP_BASE=/dashboard
-    - SB_API=http://caddy
+    - EP_CORE=http://caddy
+    - EP_TRACING=http://caddy
+    - EP_WORKERS=http://caddy
+    - EP_MEASUREMENTS=http://caddy
 
   core:
     build:
diff --git a/pkg/api/README.md b/pkg/api/README.md
index 67f317d2..922dfccd 100644
--- a/pkg/api/README.md
+++ b/pkg/api/README.md
@@ -8,7 +8,7 @@ that receives data from an AMQP source, process said data and output in the expe
 
 Find out more at: https://developer.sensorbucket.nl/
 
-Developed and designed by Provincie Zeeland and Pollex
+Developed and designed by Provincie Zeeland and Pollex'
 
 
 ## Overview
@@ -213,21 +213,27 @@ Class | Method | HTTP request | Description
 
 
 
-### basicAuth
+### APIKey
 
-- **Type**: HTTP basic authentication
+- **Type**: HTTP Bearer token authentication
 
 Example
 
 ```golang
-auth := context.WithValue(context.Background(), sw.ContextBasicAuth, sw.BasicAuth{
-    UserName: "username",
-    Password: "password",
-})
+auth := context.WithValue(context.Background(), sw.ContextAccessToken, "BEARER_TOKEN_STRING")
 r, err := client.Service.Operation(auth, args)
 ```
 
 
+### CookieSession
+
+- **Type**: API key
+- **API key parameter name**: SID
+- **Location**: 
+
+Note, each API key must be added to a map of `map[string]APIKey` where the key is: SID and passed in as the auth context for each request.
+
+
 ## Documentation for Utility Methods
 
 Due to the fact that model structure members are all pointers, this package contains
diff --git a/pkg/api/api_api_keys.go b/pkg/api/api_api_keys.go
index ff479ffb..6f2c3dec 100644
--- a/pkg/api/api_api_keys.go
+++ b/pkg/api/api_api_keys.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/api_devices.go b/pkg/api/api_devices.go
index ee693843..f8fbfe38 100644
--- a/pkg/api/api_devices.go
+++ b/pkg/api/api_devices.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/api_measurements.go b/pkg/api/api_measurements.go
index 249fcc4b..289559e0 100644
--- a/pkg/api/api_measurements.go
+++ b/pkg/api/api_measurements.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/api_pipelines.go b/pkg/api/api_pipelines.go
index 4dddde90..e51bf19f 100644
--- a/pkg/api/api_pipelines.go
+++ b/pkg/api/api_pipelines.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/api_tenants.go b/pkg/api/api_tenants.go
index 19e3a091..8b658aea 100644
--- a/pkg/api/api_tenants.go
+++ b/pkg/api/api_tenants.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/api_tracing.go b/pkg/api/api_tracing.go
index 40f89caf..72dd55cf 100644
--- a/pkg/api/api_tracing.go
+++ b/pkg/api/api_tracing.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/api_uplink.go b/pkg/api/api_uplink.go
index 05c442df..cce4788b 100644
--- a/pkg/api/api_uplink.go
+++ b/pkg/api/api_uplink.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/api_workers.go b/pkg/api/api_workers.go
index 8988177d..5650a756 100644
--- a/pkg/api/api_workers.go
+++ b/pkg/api/api_workers.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/client.go b/pkg/api/client.go
index 1987ef21..26c93a92 100644
--- a/pkg/api/client.go
+++ b/pkg/api/client.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/configuration.go b/pkg/api/configuration.go
index 814107b7..003474b3 100644
--- a/pkg/api/configuration.go
+++ b/pkg/api/configuration.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
@@ -109,10 +109,6 @@ func NewConfiguration() *Configuration {
 				URL: "https://sensorbucket.nl/api",
 				Description: "Production",
 			},
-			{
-				URL: "http://localhost:3000/api",
-				Description: "Local docker environment",
-			},
 		},
 		OperationServers: map[string]ServerConfigurations{
 		},
diff --git a/pkg/api/model_add_sensor_to_sensor_group_201_response.go b/pkg/api/model_add_sensor_to_sensor_group_201_response.go
index 6853e060..71941863 100644
--- a/pkg/api/model_add_sensor_to_sensor_group_201_response.go
+++ b/pkg/api/model_add_sensor_to_sensor_group_201_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_add_sensor_to_sensor_group_request.go b/pkg/api/model_add_sensor_to_sensor_group_request.go
index bb1c97b0..7e9dedab 100644
--- a/pkg/api/model_add_sensor_to_sensor_group_request.go
+++ b/pkg/api/model_add_sensor_to_sensor_group_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_add_tenant_member_201_response.go b/pkg/api/model_add_tenant_member_201_response.go
index 534246a2..03ef06a6 100644
--- a/pkg/api/model_add_tenant_member_201_response.go
+++ b/pkg/api/model_add_tenant_member_201_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_add_tenant_member_request.go b/pkg/api/model_add_tenant_member_request.go
index 9c3e2068..d4d8cd93 100644
--- a/pkg/api/model_add_tenant_member_request.go
+++ b/pkg/api/model_add_tenant_member_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_api_error.go b/pkg/api/model_api_error.go
index f4655715..4ee4b1dd 100644
--- a/pkg/api/model_api_error.go
+++ b/pkg/api/model_api_error.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_api_key.go b/pkg/api/model_api_key.go
index 889b0284..0434940f 100644
--- a/pkg/api/model_api_key.go
+++ b/pkg/api/model_api_key.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_api_key_created.go b/pkg/api/model_api_key_created.go
index 886f5b99..94d02168 100644
--- a/pkg/api/model_api_key_created.go
+++ b/pkg/api/model_api_key_created.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_archived_ingress.go b/pkg/api/model_archived_ingress.go
index 3a4dc721..ce53feb5 100644
--- a/pkg/api/model_archived_ingress.go
+++ b/pkg/api/model_archived_ingress.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_create_api_key_request.go b/pkg/api/model_create_api_key_request.go
index dfb25f22..2f940bf9 100644
--- a/pkg/api/model_create_api_key_request.go
+++ b/pkg/api/model_create_api_key_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_create_device_201_response.go b/pkg/api/model_create_device_201_response.go
index 9d1db6b6..7be8c76d 100644
--- a/pkg/api/model_create_device_201_response.go
+++ b/pkg/api/model_create_device_201_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_create_device_request.go b/pkg/api/model_create_device_request.go
index d102030a..2d7650a7 100644
--- a/pkg/api/model_create_device_request.go
+++ b/pkg/api/model_create_device_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_create_device_sensor_201_response.go b/pkg/api/model_create_device_sensor_201_response.go
index a181b4dc..1977be35 100644
--- a/pkg/api/model_create_device_sensor_201_response.go
+++ b/pkg/api/model_create_device_sensor_201_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_create_pipeline_200_response.go b/pkg/api/model_create_pipeline_200_response.go
index 253be05a..a6736f4f 100644
--- a/pkg/api/model_create_pipeline_200_response.go
+++ b/pkg/api/model_create_pipeline_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_create_pipeline_request.go b/pkg/api/model_create_pipeline_request.go
index cadef8fc..48ab66c4 100644
--- a/pkg/api/model_create_pipeline_request.go
+++ b/pkg/api/model_create_pipeline_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_create_sensor_group_201_response.go b/pkg/api/model_create_sensor_group_201_response.go
index 4514e913..116e7daf 100644
--- a/pkg/api/model_create_sensor_group_201_response.go
+++ b/pkg/api/model_create_sensor_group_201_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_create_sensor_group_request.go b/pkg/api/model_create_sensor_group_request.go
index be20f78a..06c31495 100644
--- a/pkg/api/model_create_sensor_group_request.go
+++ b/pkg/api/model_create_sensor_group_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_create_sensor_request.go b/pkg/api/model_create_sensor_request.go
index 5ce4b985..cd7bf8d0 100644
--- a/pkg/api/model_create_sensor_request.go
+++ b/pkg/api/model_create_sensor_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_create_user_worker_request.go b/pkg/api/model_create_user_worker_request.go
index 8e39cd27..69d064d6 100644
--- a/pkg/api/model_create_user_worker_request.go
+++ b/pkg/api/model_create_user_worker_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_create_worker_201_response.go b/pkg/api/model_create_worker_201_response.go
index cc1fce20..b280a794 100644
--- a/pkg/api/model_create_worker_201_response.go
+++ b/pkg/api/model_create_worker_201_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_datastream.go b/pkg/api/model_datastream.go
index b06f38d2..279f5198 100644
--- a/pkg/api/model_datastream.go
+++ b/pkg/api/model_datastream.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_delete_device_sensor_200_response.go b/pkg/api/model_delete_device_sensor_200_response.go
index a773ecf7..2639a113 100644
--- a/pkg/api/model_delete_device_sensor_200_response.go
+++ b/pkg/api/model_delete_device_sensor_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_delete_sensor_from_sensor_group_200_response.go b/pkg/api/model_delete_sensor_from_sensor_group_200_response.go
index 5a5d6197..6fb6eeef 100644
--- a/pkg/api/model_delete_sensor_from_sensor_group_200_response.go
+++ b/pkg/api/model_delete_sensor_from_sensor_group_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_delete_sensor_group_200_response.go b/pkg/api/model_delete_sensor_group_200_response.go
index 6fd29cec..d9a1ff75 100644
--- a/pkg/api/model_delete_sensor_group_200_response.go
+++ b/pkg/api/model_delete_sensor_group_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_device.go b/pkg/api/model_device.go
index 494ac825..7ad66f4e 100644
--- a/pkg/api/model_device.go
+++ b/pkg/api/model_device.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_disable_pipeline_200_response.go b/pkg/api/model_disable_pipeline_200_response.go
index 0ec145c7..244bef58 100644
--- a/pkg/api/model_disable_pipeline_200_response.go
+++ b/pkg/api/model_disable_pipeline_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_get_datastream_200_response.go b/pkg/api/model_get_datastream_200_response.go
index f2bd4672..2f9fee16 100644
--- a/pkg/api/model_get_datastream_200_response.go
+++ b/pkg/api/model_get_datastream_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_get_datastream_200_response_data.go b/pkg/api/model_get_datastream_200_response_data.go
index 1ee73622..cd1ab96a 100644
--- a/pkg/api/model_get_datastream_200_response_data.go
+++ b/pkg/api/model_get_datastream_200_response_data.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_get_device_200_response.go b/pkg/api/model_get_device_200_response.go
index dd515b98..0c73cba8 100644
--- a/pkg/api/model_get_device_200_response.go
+++ b/pkg/api/model_get_device_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_get_pipeline_200_response.go b/pkg/api/model_get_pipeline_200_response.go
index 12003ff0..34231c2f 100644
--- a/pkg/api/model_get_pipeline_200_response.go
+++ b/pkg/api/model_get_pipeline_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_get_sensor_group_200_response.go b/pkg/api/model_get_sensor_group_200_response.go
index a4c60d8c..802fb70f 100644
--- a/pkg/api/model_get_sensor_group_200_response.go
+++ b/pkg/api/model_get_sensor_group_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_get_worker_200_response.go b/pkg/api/model_get_worker_200_response.go
index f0a38cb0..a01e6191 100644
--- a/pkg/api/model_get_worker_200_response.go
+++ b/pkg/api/model_get_worker_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_get_worker_user_code_200_response.go b/pkg/api/model_get_worker_user_code_200_response.go
index 3eb1354f..ccb8da45 100644
--- a/pkg/api/model_get_worker_user_code_200_response.go
+++ b/pkg/api/model_get_worker_user_code_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_ingress_dto.go b/pkg/api/model_ingress_dto.go
index cce7c269..71ecbb20 100644
--- a/pkg/api/model_ingress_dto.go
+++ b/pkg/api/model_ingress_dto.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_api_keys_200_response.go b/pkg/api/model_list_api_keys_200_response.go
index 3c4ad380..3de0f86c 100644
--- a/pkg/api/model_list_api_keys_200_response.go
+++ b/pkg/api/model_list_api_keys_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_api_keys_200_response_all_of.go b/pkg/api/model_list_api_keys_200_response_all_of.go
index bf2f6623..ce3f4b56 100644
--- a/pkg/api/model_list_api_keys_200_response_all_of.go
+++ b/pkg/api/model_list_api_keys_200_response_all_of.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_datastreams_200_response.go b/pkg/api/model_list_datastreams_200_response.go
index 96c2a9f9..5177d750 100644
--- a/pkg/api/model_list_datastreams_200_response.go
+++ b/pkg/api/model_list_datastreams_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_datastreams_200_response_all_of.go b/pkg/api/model_list_datastreams_200_response_all_of.go
index bd92ae74..0e1c5ccf 100644
--- a/pkg/api/model_list_datastreams_200_response_all_of.go
+++ b/pkg/api/model_list_datastreams_200_response_all_of.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_device_sensors_200_response.go b/pkg/api/model_list_device_sensors_200_response.go
index b6e61301..3f2a45d2 100644
--- a/pkg/api/model_list_device_sensors_200_response.go
+++ b/pkg/api/model_list_device_sensors_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_device_sensors_200_response_all_of.go b/pkg/api/model_list_device_sensors_200_response_all_of.go
index 5a722fb9..dc542ac3 100644
--- a/pkg/api/model_list_device_sensors_200_response_all_of.go
+++ b/pkg/api/model_list_device_sensors_200_response_all_of.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_devices_200_response.go b/pkg/api/model_list_devices_200_response.go
index 9367921f..fb185e30 100644
--- a/pkg/api/model_list_devices_200_response.go
+++ b/pkg/api/model_list_devices_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_devices_200_response_all_of.go b/pkg/api/model_list_devices_200_response_all_of.go
index 36ee618d..37352e4c 100644
--- a/pkg/api/model_list_devices_200_response_all_of.go
+++ b/pkg/api/model_list_devices_200_response_all_of.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_ingresses_200_response.go b/pkg/api/model_list_ingresses_200_response.go
index d9d57047..c96c664c 100644
--- a/pkg/api/model_list_ingresses_200_response.go
+++ b/pkg/api/model_list_ingresses_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_ingresses_200_response_all_of.go b/pkg/api/model_list_ingresses_200_response_all_of.go
index 79040062..1a75a905 100644
--- a/pkg/api/model_list_ingresses_200_response_all_of.go
+++ b/pkg/api/model_list_ingresses_200_response_all_of.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_pipelines_200_response.go b/pkg/api/model_list_pipelines_200_response.go
index 11cf16cc..36b192b2 100644
--- a/pkg/api/model_list_pipelines_200_response.go
+++ b/pkg/api/model_list_pipelines_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_pipelines_200_response_all_of.go b/pkg/api/model_list_pipelines_200_response_all_of.go
index f0cd7897..8a409136 100644
--- a/pkg/api/model_list_pipelines_200_response_all_of.go
+++ b/pkg/api/model_list_pipelines_200_response_all_of.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_sensor_groups_200_response.go b/pkg/api/model_list_sensor_groups_200_response.go
index 4b90acc5..17142dea 100644
--- a/pkg/api/model_list_sensor_groups_200_response.go
+++ b/pkg/api/model_list_sensor_groups_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_sensor_groups_200_response_all_of.go b/pkg/api/model_list_sensor_groups_200_response_all_of.go
index 65831f11..66205232 100644
--- a/pkg/api/model_list_sensor_groups_200_response_all_of.go
+++ b/pkg/api/model_list_sensor_groups_200_response_all_of.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_tenants_200_response.go b/pkg/api/model_list_tenants_200_response.go
index 41d3144b..0f32a7e1 100644
--- a/pkg/api/model_list_tenants_200_response.go
+++ b/pkg/api/model_list_tenants_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_tenants_200_response_all_of.go b/pkg/api/model_list_tenants_200_response_all_of.go
index 8c2a9d28..53667c5b 100644
--- a/pkg/api/model_list_tenants_200_response_all_of.go
+++ b/pkg/api/model_list_tenants_200_response_all_of.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_traces_200_response.go b/pkg/api/model_list_traces_200_response.go
index f2974ad5..b54747b5 100644
--- a/pkg/api/model_list_traces_200_response.go
+++ b/pkg/api/model_list_traces_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_traces_200_response_all_of.go b/pkg/api/model_list_traces_200_response_all_of.go
index ead35f5a..5b84eb3d 100644
--- a/pkg/api/model_list_traces_200_response_all_of.go
+++ b/pkg/api/model_list_traces_200_response_all_of.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_workers_200_response.go b/pkg/api/model_list_workers_200_response.go
index 48426d7e..7c562822 100644
--- a/pkg/api/model_list_workers_200_response.go
+++ b/pkg/api/model_list_workers_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_list_workers_200_response_all_of.go b/pkg/api/model_list_workers_200_response_all_of.go
index c057e256..7084fd3e 100644
--- a/pkg/api/model_list_workers_200_response_all_of.go
+++ b/pkg/api/model_list_workers_200_response_all_of.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_measurement.go b/pkg/api/model_measurement.go
index 80913180..ab91a486 100644
--- a/pkg/api/model_measurement.go
+++ b/pkg/api/model_measurement.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_paginated_response.go b/pkg/api/model_paginated_response.go
index 1b7e3b97..d375b6e9 100644
--- a/pkg/api/model_paginated_response.go
+++ b/pkg/api/model_paginated_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_paginated_response_links.go b/pkg/api/model_paginated_response_links.go
index 6c28553c..3cf38736 100644
--- a/pkg/api/model_paginated_response_links.go
+++ b/pkg/api/model_paginated_response_links.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_pipeline.go b/pkg/api/model_pipeline.go
index 59ce31fe..bb0377ec 100644
--- a/pkg/api/model_pipeline.go
+++ b/pkg/api/model_pipeline.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_query_measurements_200_response.go b/pkg/api/model_query_measurements_200_response.go
index 55e6d26c..82388019 100644
--- a/pkg/api/model_query_measurements_200_response.go
+++ b/pkg/api/model_query_measurements_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_query_measurements_200_response_all_of.go b/pkg/api/model_query_measurements_200_response_all_of.go
index 7a196172..e9ba517c 100644
--- a/pkg/api/model_query_measurements_200_response_all_of.go
+++ b/pkg/api/model_query_measurements_200_response_all_of.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_remove_tenant_member_200_response.go b/pkg/api/model_remove_tenant_member_200_response.go
index b239c851..e1964242 100644
--- a/pkg/api/model_remove_tenant_member_200_response.go
+++ b/pkg/api/model_remove_tenant_member_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_revoke_api_key_200_response.go b/pkg/api/model_revoke_api_key_200_response.go
index 0d7a79af..856fc78b 100644
--- a/pkg/api/model_revoke_api_key_200_response.go
+++ b/pkg/api/model_revoke_api_key_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_sensor.go b/pkg/api/model_sensor.go
index 8f805f72..4f25bf3f 100644
--- a/pkg/api/model_sensor.go
+++ b/pkg/api/model_sensor.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_sensor_group.go b/pkg/api/model_sensor_group.go
index 464d34f8..0553558b 100644
--- a/pkg/api/model_sensor_group.go
+++ b/pkg/api/model_sensor_group.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_tenant.go b/pkg/api/model_tenant.go
index 8def814b..77819e52 100644
--- a/pkg/api/model_tenant.go
+++ b/pkg/api/model_tenant.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_trace.go b/pkg/api/model_trace.go
index b4f330a7..da8639a9 100644
--- a/pkg/api/model_trace.go
+++ b/pkg/api/model_trace.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_trace_step.go b/pkg/api/model_trace_step.go
index 180033fb..0ed573a9 100644
--- a/pkg/api/model_trace_step.go
+++ b/pkg/api/model_trace_step.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_update_device_200_response.go b/pkg/api/model_update_device_200_response.go
index f11d29cd..85100a71 100644
--- a/pkg/api/model_update_device_200_response.go
+++ b/pkg/api/model_update_device_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_update_device_request.go b/pkg/api/model_update_device_request.go
index 18b59125..04df8c94 100644
--- a/pkg/api/model_update_device_request.go
+++ b/pkg/api/model_update_device_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_update_pipeline_200_response.go b/pkg/api/model_update_pipeline_200_response.go
index b5fdd83b..958741d1 100644
--- a/pkg/api/model_update_pipeline_200_response.go
+++ b/pkg/api/model_update_pipeline_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_update_pipeline_request.go b/pkg/api/model_update_pipeline_request.go
index ceae9ba4..632f01de 100644
--- a/pkg/api/model_update_pipeline_request.go
+++ b/pkg/api/model_update_pipeline_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_update_sensor_group_200_response.go b/pkg/api/model_update_sensor_group_200_response.go
index 03af5086..e4e78edb 100644
--- a/pkg/api/model_update_sensor_group_200_response.go
+++ b/pkg/api/model_update_sensor_group_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_update_sensor_group_request.go b/pkg/api/model_update_sensor_group_request.go
index 70557d44..08ad0a0e 100644
--- a/pkg/api/model_update_sensor_group_request.go
+++ b/pkg/api/model_update_sensor_group_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_update_tenant_member_request.go b/pkg/api/model_update_tenant_member_request.go
index bf7c794d..1068aaab 100644
--- a/pkg/api/model_update_tenant_member_request.go
+++ b/pkg/api/model_update_tenant_member_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_update_worker_200_response.go b/pkg/api/model_update_worker_200_response.go
index 9f47919a..534f3ac9 100644
--- a/pkg/api/model_update_worker_200_response.go
+++ b/pkg/api/model_update_worker_200_response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_update_worker_request.go b/pkg/api/model_update_worker_request.go
index 75dd4114..60756249 100644
--- a/pkg/api/model_update_worker_request.go
+++ b/pkg/api/model_update_worker_request.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/model_user_worker.go b/pkg/api/model_user_worker.go
index f399aabb..9b313a83 100644
--- a/pkg/api/model_user_worker.go
+++ b/pkg/api/model_user_worker.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/response.go b/pkg/api/response.go
index eec98f63..ebd4f25a 100644
--- a/pkg/api/response.go
+++ b/pkg/api/response.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/api/utils.go b/pkg/api/utils.go
index 7ee9b7d0..6af80f35 100644
--- a/pkg/api/utils.go
+++ b/pkg/api/utils.go
@@ -1,7 +1,7 @@
 /*
 Sensorbucket API
 
-SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex 
+SensorBucket processes data from different sources and devices into a single standardized format.  An applications connected to SensorBucket, can use all devices SensorBucket supports.  Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker that receives data from an AMQP source, process said data and output in the expected worker output format.  Find out more at: https://developer.sensorbucket.nl/  Developed and designed by Provincie Zeeland and Pollex' 
 
 API version: 1.1-rc1
 Contact: info@pollex.nl
diff --git a/pkg/auth/context.go b/pkg/auth/context.go
index 201b0a6e..c8bfe5b9 100644
--- a/pkg/auth/context.go
+++ b/pkg/auth/context.go
@@ -1,6 +1,10 @@
 package auth
 
-import "context"
+import (
+	"context"
+	"errors"
+	"fmt"
+)
 
 type ctxKey int
 
@@ -10,6 +14,11 @@ const (
 	ctxPermissions
 )
 
+var (
+	ErrInvalidContext = errors.New("invalid auth context")
+	ErrContextMissing = errors.New("missing auth context")
+)
+
 func setUserID(ctx context.Context, userID string) context.Context {
 	return context.WithValue(ctx, ctxUserID, userID)
 }
@@ -23,36 +32,51 @@ func setPermissions(ctx context.Context, permissions Permissions) context.Contex
 }
 
 func GetTenant(ctx context.Context) (int64, error) {
-	val, ok := fromContext[int64](ctx, ctxTenantID)
-	if !ok || val == 0 {
-		return 0, ErrNoTenantIDFound
+	value := ctx.Value(ctxTenantID)
+	if value == nil {
+		return 0, fmt.Errorf("%w: %w", ErrInvalidContext, ErrNoTenantIDFound)
+	}
+
+	typedValue, ok := value.(int64)
+	if !ok {
+		return 0, fmt.Errorf("%w: TenantID value is wrong type %T", ErrInvalidContext, value)
+	}
+
+	if typedValue == 0 {
+		return 0, fmt.Errorf("%w: %w", ErrInvalidContext, ErrNoTenantIDFound)
 	}
-	return val, nil
+
+	return typedValue, nil
 }
 
 func GetUser(ctx context.Context) (string, error) {
-	val, ok := fromContext[string](ctx, ctxUserID)
-	if !ok || val == "" {
-		return "", ErrNoUserID
+	value := ctx.Value(ctxUserID)
+	if value == nil {
+		return "", fmt.Errorf("%w: %w", ErrInvalidContext, ErrNoUserID)
 	}
-	return val, nil
-}
 
-func GetPermissions(ctx context.Context) (Permissions, error) {
-	val, ok := fromContext[Permissions](ctx, ctxPermissions)
+	typedValue, ok := value.(string)
 	if !ok {
-		return Permissions{}, ErrNoPermissions
+		return "", fmt.Errorf("%w: UserID value is wrong type %T", ErrInvalidContext, value)
+	}
+
+	if typedValue == "" {
+		return "", fmt.Errorf("%w: %w", ErrInvalidContext, ErrNoUserID)
 	}
-	return val, nil
+
+	return typedValue, nil
 }
 
-func fromContext[T any](ctx context.Context, key ctxKey) (T, bool) {
-	var val T
-	var ok bool
-	ival := ctx.Value(key)
-	if ival == nil {
-		return val, false
+func GetPermissions(ctx context.Context) (Permissions, error) {
+	value := ctx.Value(ctxPermissions)
+	if value == nil {
+		return Permissions{}, fmt.Errorf("%w: %w", ErrInvalidContext, ErrNoPermissions)
 	}
-	val, ok = ival.(T)
-	return val, ok
+
+	typedValue, ok := value.(Permissions)
+	if !ok {
+		return Permissions{}, fmt.Errorf("%w: TenantID value is wrong type %T", ErrInvalidContext, value)
+	}
+
+	return typedValue, nil
 }
diff --git a/pkg/auth/middleware.go b/pkg/auth/middleware.go
index 07624fc0..c40effac 100644
--- a/pkg/auth/middleware.go
+++ b/pkg/auth/middleware.go
@@ -1,7 +1,9 @@
 package auth
 
 import (
+	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log"
 	"net/http"
@@ -12,6 +14,7 @@ import (
 	"github.com/golang-jwt/jwt"
 
 	"sensorbucket.nl/sensorbucket/internal/web"
+	"sensorbucket.nl/sensorbucket/pkg/api"
 )
 
 type claims struct {
@@ -62,14 +65,17 @@ func Protect() func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			if _, err := GetTenant(r.Context()); err != nil {
+				log.Printf("[Auth] %v\n", err)
 				web.HTTPError(w, ErrUnauthorized)
 				return
 			}
-			if _, err := GetUser(r.Context()); err != nil {
+			if _, err := GetUser(r.Context()); err != nil && !errors.Is(err, ErrContextMissing) {
+				log.Printf("[Auth] %v\n", err)
 				web.HTTPError(w, ErrUnauthorized)
 				return
 			}
 			if _, err := GetPermissions(r.Context()); err != nil {
+				log.Printf("[Auth] %v\n", err)
 				web.HTTPError(w, ErrUnauthorized)
 				return
 			}
@@ -79,6 +85,18 @@ func Protect() func(http.Handler) http.Handler {
 	}
 }
 
+func ForwardRequestAuthentication() func(http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			token := strings.TrimPrefix(strings.TrimPrefix(r.Header.Get("Authorization"), "bearer "), "Bearer ")
+			r = r.WithContext(context.WithValue(
+				r.Context(), api.ContextAccessToken, token,
+			))
+			next.ServeHTTP(w, r)
+		})
+	}
+}
+
 // Authentication middleware for checking the validity of any present JWT
 // Checks if the JWT is signed using the given secret
 // Serves the next HTTP handler if there is no JWT or if the JWT is OK
@@ -93,8 +111,10 @@ func Authenticate(keyClient jwksClient) func(http.Handler) http.Handler {
 				return
 			}
 
-			tokenStr, ok := strings.CutPrefix(auth, "Bearer ")
+			// Cheating, removes Bearer and bearer case independently
+			tokenStr, ok := strings.CutPrefix(auth[1:], "earer ")
 			if !ok {
+				log.Printf("[Error] authentication failed err because the Authorization header is malformed\n")
 				web.HTTPError(w, ErrAuthHeaderInvalidFormat)
 				return
 			}
@@ -103,12 +123,12 @@ func Authenticate(keyClient jwksClient) func(http.Handler) http.Handler {
 			c := claims{}
 			token, err := jwt.ParseWithClaims(tokenStr, &c, validateJWTFunc(keyClient))
 			if err != nil {
-				log.Printf("[Error] authentication failed err: %s", err)
+				log.Printf("[Error] authentication failed err: %s\n", err)
 				web.HTTPError(w, ErrUnauthorized)
 				return
 			}
 			if !token.Valid {
-				log.Printf("[Error] authentication failed err: %s", err)
+				log.Printf("[Error] authentication failed err: %s\n", err)
 				web.HTTPError(w, ErrUnauthorized)
 				return
 			}
diff --git a/pkg/auth/middleware_test.go b/pkg/auth/middleware_test.go
index 348ed418..1f9dcd7f 100644
--- a/pkg/auth/middleware_test.go
+++ b/pkg/auth/middleware_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/golang-jwt/jwt"
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 // test jwks is unreachable
@@ -82,9 +83,8 @@ func TestProtectAndAuthenticatePassClaimsToNext(t *testing.T) {
 	s.Handle("/", auth(protect(next)))
 
 	req, err := http.NewRequest("GET", "/", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
+
 	rr := httptest.NewRecorder()
 	token := createToken(jwt.MapClaims{
 		"tid": 11,
@@ -175,9 +175,8 @@ func TestProtect(t *testing.T) {
 	for scene, cfg := range scenarios {
 		t.Run(scene, func(t *testing.T) {
 			req, err := http.NewRequest("GET", "/", nil)
-			if err != nil {
-				t.Fatal(err)
-			}
+			require.NoError(t, err)
+
 			rr := httptest.NewRecorder()
 			ctx := createTestContext(context.Background(), cfg.values)
 
diff --git a/pkg/auth/permissions.go b/pkg/auth/permissions.go
index f133f4ea..59d18942 100644
--- a/pkg/auth/permissions.go
+++ b/pkg/auth/permissions.go
@@ -76,7 +76,7 @@ func (this Permissions) Fulfills(that Permissions) error {
 	return nil
 }
 
-func stringToPermission(str string) (Permission, bool) {
+func SringToPermission(str string) (Permission, bool) {
 	p, ok := stringPermissionMap[str]
 	if !ok {
 		log.Printf("Tried converting non-existant string to permission: %s\n", str)
@@ -84,10 +84,10 @@ func stringToPermission(str string) (Permission, bool) {
 	return p, ok
 }
 
-func stringsToPermissions(keys []string) (Permissions, error) {
+func StringsToPermissions(keys []string) (Permissions, error) {
 	permissions := make([]Permission, 0, len(keys))
 	for _, str := range keys {
-		permission, ok := stringToPermission(str)
+		permission, ok := SringToPermission(str)
 		if !ok {
 			return nil, fmt.Errorf("%w: %s", ErrPermissionInvalid, str)
 		}
@@ -105,7 +105,7 @@ func (permissions *Permissions) UnmarshalJSON(data []byte) error {
 	if err := json.Unmarshal(data, &strings); err != nil {
 		return fmt.Errorf("could not unmarshal permissions: %w", err)
 	}
-	perms, err := stringsToPermissions(strings)
+	perms, err := StringsToPermissions(strings)
 	if err != nil {
 		return fmt.Errorf("could not unmarshal permissions: %w", err)
 	}
diff --git a/pkg/auth/permissions_test.go b/pkg/auth/permissions_test.go
index dfd2e785..ea109de4 100644
--- a/pkg/auth/permissions_test.go
+++ b/pkg/auth/permissions_test.go
@@ -29,7 +29,7 @@ func TestStringToPermissions(t *testing.T) {
 	}
 	for _, tC := range testCases {
 		t.Run(tC.desc, func(t *testing.T) {
-			perms, err := stringsToPermissions(tC.strings)
+			perms, err := StringsToPermissions(tC.strings)
 			assert.ErrorIs(t, err, tC.expectedError)
 			assert.Equal(t, tC.expectedPermissions, perms)
 		})
diff --git a/pkg/auth/utils_test.go b/pkg/auth/utils_test.go
index 10eb68c5..3a3a6393 100644
--- a/pkg/auth/utils_test.go
+++ b/pkg/auth/utils_test.go
@@ -186,7 +186,7 @@ func TestGetTenant(t *testing.T) {
 
 			// Assert
 			assert.Equal(t, cfg.expectedRes, result)
-			assert.Equal(t, cfg.expectedErr, err)
+			assert.ErrorIs(t, err, cfg.expectedErr)
 		})
 	}
 }
diff --git a/pkg/layout/layout.qtpl b/pkg/layout/layout.qtpl
index 4ed18dfa..a564db90 100644
--- a/pkg/layout/layout.qtpl
+++ b/pkg/layout/layout.qtpl
@@ -53,7 +53,7 @@ type BasePage struct {
     <script type="text/javascript" src="https://unpkg.com/uplot@1.6.25/dist/uPlot.iife.min.js"></script>
     <script type="text/javascript" src="{%s U("static/uplot.htmx.js") %}"></script>
     <script type="text/javascript" src="{%s U("static/leaflet.htmx.js") %}"></script>
-    <script src="http://SortableJS.github.io/Sortable/Sortable.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/sortablejs@1.15.2/Sortable.min.js"></script>
     <script type="text/javascript">
         window.addEventListener("DOMContentLoaded", function(){
             document.body.addEventListener("showSnackbar", function(evt) {
diff --git a/services/core/main.go b/services/core/main.go
index 86e7d75b..96baebf8 100644
--- a/services/core/main.go
+++ b/services/core/main.go
@@ -18,6 +18,7 @@ import (
 	"github.com/rs/cors"
 
 	"sensorbucket.nl/sensorbucket/internal/env"
+	"sensorbucket.nl/sensorbucket/pkg/auth"
 	"sensorbucket.nl/sensorbucket/pkg/mq"
 	"sensorbucket.nl/sensorbucket/services/core/devices"
 	deviceinfra "sensorbucket.nl/sensorbucket/services/core/devices/infra"
@@ -45,6 +46,7 @@ var (
 	AMQP_PREFETCH                = env.Could("AMQP_PREFETCH", "5")
 	HTTP_ADDR                    = env.Could("HTTP_ADDR", ":3000")
 	HTTP_BASE                    = env.Could("HTTP_BASE", "http://localhost:3000/api")
+	AUTH_JWKS_URL                = env.Could("AUTH_JWKS_URL", "http://oathkeeper:4456/.well-known/jwks.json")
 	SYS_ARCHIVE_TIME             = env.Could("SYS_ARCHIVE_TIME", "30")
 )
 
@@ -91,7 +93,8 @@ func Run() error {
 
 	// Setup HTTP Transport
 	r := chi.NewRouter()
-	r.Use(middleware.Logger)
+	jwks := auth.NewJWKSHttpClient(AUTH_JWKS_URL)
+	r.Use(middleware.Logger, auth.Authenticate(jwks), auth.Protect())
 	deviceshttp.SetupRoutes(r)
 	measurementhttp.SetupRoutes(r)
 	processinghttp.SetupRoutes(r)
diff --git a/services/dashboard/main.go b/services/dashboard/main.go
index b6a8fc47..47e79f4c 100644
--- a/services/dashboard/main.go
+++ b/services/dashboard/main.go
@@ -5,6 +5,7 @@ import (
 	"embed"
 	"errors"
 	"fmt"
+	"log"
 	"net/http"
 	"net/url"
 	"os"
@@ -16,6 +17,7 @@ import (
 
 	"sensorbucket.nl/sensorbucket/internal/env"
 	"sensorbucket.nl/sensorbucket/pkg/api"
+	"sensorbucket.nl/sensorbucket/pkg/auth"
 	"sensorbucket.nl/sensorbucket/services/dashboard/routes"
 	"sensorbucket.nl/sensorbucket/services/dashboard/views"
 )
@@ -27,9 +29,13 @@ func main() {
 }
 
 var (
-	HTTP_ADDR = env.Could("HTTP_ADDR", ":3000")
-	HTTP_BASE = env.Could("HTTP_BASE", "")
-	SB_API    = env.Must("SB_API")
+	HTTP_ADDR       = env.Could("HTTP_ADDR", ":3000")
+	HTTP_BASE       = env.Could("HTTP_BASE", "")
+	AUTH_JWKS_URL   = env.Could("AUTH_JWKS_URL", "http://oathkeeper:4456/.well-known/jwks.json")
+	EP_CORE         = env.Must("EP_CORE")
+	EP_WORKERS      = env.Must("EP_WORKERS")
+	EP_TRACING      = env.Must("EP_TRACING")
+	EP_MEASUREMENTS = env.Must("EP_MEASUREMENTS")
 )
 
 //go:embed static/*
@@ -41,7 +47,13 @@ func Run() error {
 	defer cancel()
 
 	router := chi.NewRouter()
-	router.Use(middleware.Logger)
+	jwks := auth.NewJWKSHttpClient(AUTH_JWKS_URL)
+	router.Use(
+		middleware.Logger,
+		auth.ForwardRequestAuthentication(),
+		auth.Authenticate(jwks),
+		auth.Protect(),
+	)
 
 	var baseURL *url.URL
 	if HTTP_BASE != "" {
@@ -49,34 +61,10 @@ func Run() error {
 		views.SetBase(baseURL)
 	}
 
-	// Middleware to pass on basic auth to the client api
-	router.Use(func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			user, pass, ok := r.BasicAuth()
-			if ok {
-				r = r.WithContext(context.WithValue(
-					r.Context(), api.ContextBasicAuth, api.BasicAuth{
-						UserName: user,
-						Password: pass,
-					}))
-			}
-			next.ServeHTTP(w, r)
-		})
-	})
-
 	// Serve static files
 	fileServer := http.FileServer(http.FS(staticFS))
 	router.Handle("/static/*", fileServer)
 
-	sbURL, err := url.Parse(SB_API)
-	if err != nil {
-		return fmt.Errorf("could not parse SB_API url: %w", err)
-	}
-	cfg := api.NewConfiguration()
-	cfg.Scheme = sbURL.Scheme
-	cfg.Host = sbURL.Host
-	apiClient := api.NewAPIClient(cfg)
-
 	router.Get("/", func(w http.ResponseWriter, r *http.Request) {
 		u := "/overview"
 		if baseURL != nil {
@@ -84,10 +72,22 @@ func Run() error {
 		}
 		http.Redirect(w, r, u, http.StatusFound)
 	})
-	router.Mount("/overview", routes.CreateOverviewPageHandler(apiClient))
-	router.Mount("/ingress", routes.CreateIngressPageHandler(apiClient))
-	router.Mount("/workers", routes.CreateWorkerPageHandler(apiClient))
-	router.Mount("/pipelines", routes.CreatePipelinePageHandler(apiClient))
+	router.Mount("/overview", routes.CreateOverviewPageHandler(
+		createAPIClient(EP_CORE),
+		createAPIClient(EP_MEASUREMENTS),
+	))
+	router.Mount("/ingress", routes.CreateIngressPageHandler(
+		createAPIClient(EP_CORE),
+		createAPIClient(EP_TRACING),
+		createAPIClient(EP_WORKERS),
+	))
+	router.Mount("/workers", routes.CreateWorkerPageHandler(
+		createAPIClient(EP_WORKERS),
+	))
+	router.Mount("/pipelines", routes.CreatePipelinePageHandler(
+		createAPIClient(EP_WORKERS),
+		createAPIClient(EP_CORE),
+	))
 	srv := &http.Server{
 		Addr:         HTTP_ADDR,
 		WriteTimeout: 5 * time.Second,
@@ -103,6 +103,7 @@ func Run() error {
 	fmt.Printf("HTTP Server listening on: %s\n", srv.Addr)
 
 	// Wait for fatal error or interrupt signal
+	var err error
 	select {
 	case <-ctx.Done():
 	case err = <-errC:
@@ -118,3 +119,14 @@ func Run() error {
 
 	return err
 }
+
+func createAPIClient(baseurl string) *api.APIClient {
+	sbURL, err := url.Parse(baseurl)
+	if err != nil {
+		log.Fatalf("could not parse APIClient url: %s\n", err)
+	}
+	cfg := api.NewConfiguration()
+	cfg.Scheme = sbURL.Scheme
+	cfg.Host = sbURL.Host
+	return api.NewAPIClient(cfg)
+}
diff --git a/services/dashboard/routes/context.go b/services/dashboard/routes/context.go
index 165ba2f1..95cc71a0 100644
--- a/services/dashboard/routes/context.go
+++ b/services/dashboard/routes/context.go
@@ -42,7 +42,7 @@ func getWorkers(ctx context.Context) []api.UserWorker {
 }
 
 func getWorkersCursor(ctx context.Context) *string {
-	value, ok := ctx.Value(ctxWorkers).(*string)
+	value, ok := ctx.Value(ctxWorkersCursor).(*string)
 	if !ok {
 		return nil
 	}
diff --git a/services/dashboard/routes/ingress.go b/services/dashboard/routes/ingress.go
index f4ec35a3..c6fb9d6e 100644
--- a/services/dashboard/routes/ingress.go
+++ b/services/dashboard/routes/ingress.go
@@ -17,14 +17,18 @@ import (
 )
 
 type IngressPageHandler struct {
-	router chi.Router
-	client *api.APIClient
+	router        chi.Router
+	coreClient    *api.APIClient
+	tracingClient *api.APIClient
+	workersClient *api.APIClient
 }
 
-func CreateIngressPageHandler(client *api.APIClient) *IngressPageHandler {
+func CreateIngressPageHandler(core, tracing, workers *api.APIClient) *IngressPageHandler {
 	handler := &IngressPageHandler{
-		router: chi.NewRouter(),
-		client: client,
+		router:        chi.NewRouter(),
+		coreClient:    core,
+		tracingClient: tracing,
+		workersClient: workers,
 	}
 	handler.SetupRoutes(handler.router)
 	return handler
@@ -40,18 +44,18 @@ func (h *IngressPageHandler) SetupRoutes(r chi.Router) {
 }
 
 func (h *IngressPageHandler) createViewIngresses(ctx context.Context) ([]views.Ingress, error) {
-	resIngresses, _, err := h.client.TracingApi.ListIngresses(ctx).Limit(30).Execute()
+	resIngresses, _, err := h.tracingClient.TracingApi.ListIngresses(ctx).Limit(30).Execute()
 	if err != nil {
 		return nil, fmt.Errorf("error listing ingresses: %w", err)
 	}
-	resPipelines, _, err := h.client.PipelinesApi.ListPipelines(ctx).Execute()
+	resPipelines, _, err := h.coreClient.PipelinesApi.ListPipelines(ctx).Execute()
 	if err != nil {
 		return nil, fmt.Errorf("error listing pipelines: %w", err)
 	}
 
 	plSteps := lo.FlatMap(resPipelines.Data, func(p api.Pipeline, _ int) []string { return p.Steps })
 	plSteps = lo.Uniq(plSteps)
-	resWorkers, _, err := h.client.WorkersApi.ListWorkers(ctx).Id(plSteps).Execute()
+	resWorkers, _, err := h.workersClient.WorkersApi.ListWorkers(ctx).Id(plSteps).Execute()
 	if err != nil {
 		return nil, fmt.Errorf("error listing workers: %w", err)
 	}
@@ -61,7 +65,7 @@ func (h *IngressPageHandler) createViewIngresses(ctx context.Context) ([]views.I
 
 	traceIDs := lo.Map(resIngresses.Data, func(ing api.ArchivedIngress, _ int) string { return ing.GetTracingId() })
 	traceIDs = lo.Uniq(traceIDs)
-	resLogs, _, err := h.client.TracingApi.ListTraces(ctx).TracingId(traceIDs).Execute()
+	resLogs, _, err := h.tracingClient.TracingApi.ListTraces(ctx).TracingId(traceIDs).Execute()
 	if err != nil {
 		return nil, fmt.Errorf("error listing traces: %w", err)
 	}
@@ -72,7 +76,7 @@ func (h *IngressPageHandler) createViewIngresses(ctx context.Context) ([]views.I
 	deviceIDs := lo.FilterMap(resLogs.Data, func(traceLog api.Trace, _ int) (int64, bool) {
 		return traceLog.DeviceId, traceLog.DeviceId > 0
 	})
-	resDevices, _, err := h.client.DevicesApi.ListDevices(ctx).Id(lo.Uniq(deviceIDs)).Execute()
+	resDevices, _, err := h.coreClient.DevicesApi.ListDevices(ctx).Id(lo.Uniq(deviceIDs)).Execute()
 	if err != nil {
 		return nil, fmt.Errorf("error listing devices: %w", err)
 	}
diff --git a/services/dashboard/routes/overview.go b/services/dashboard/routes/overview.go
index 312aeef2..2b8221ad 100644
--- a/services/dashboard/routes/overview.go
+++ b/services/dashboard/routes/overview.go
@@ -23,14 +23,16 @@ import (
 )
 
 type OverviewRoute struct {
-	router chi.Router
-	client *api.APIClient
+	router             chi.Router
+	measurementsClient *api.APIClient
+	coreClient         *api.APIClient
 }
 
-func CreateOverviewPageHandler(client *api.APIClient) *OverviewRoute {
+func CreateOverviewPageHandler(measurements, core *api.APIClient) *OverviewRoute {
 	t := &OverviewRoute{
-		client: client,
-		router: chi.NewRouter(),
+		measurementsClient: measurements,
+		coreClient:         core,
+		router:             chi.NewRouter(),
 	}
 	t.SetupRoutes(t.router)
 	return t
@@ -76,14 +78,14 @@ func (t *OverviewRoute) createSensorGroup() http.HandlerFunc {
 				web.HTTPError(w, err)
 				return
 			}
-			res, _, err := t.client.DevicesApi.GetSensorGroup(r.Context(), sgID).Execute()
+			res, _, err := t.coreClient.DevicesApi.GetSensorGroup(r.Context(), sgID).Execute()
 			if err != nil {
 				web.HTTPError(w, err)
 				return
 			}
 			sg = res.Data
 		}
-		req := t.client.DevicesApi.ListDevices(r.Context())
+		req := t.coreClient.DevicesApi.ListDevices(r.Context())
 		if sg != nil {
 			req = req.SensorGroup([]int64{sg.GetId()})
 		}
@@ -101,7 +103,7 @@ func (t *OverviewRoute) createSensorGroup() http.HandlerFunc {
 
 func (t *OverviewRoute) deleteSensorGroup() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		res, _, err := t.client.DevicesApi.ListDevices(r.Context()).Execute()
+		res, _, err := t.coreClient.DevicesApi.ListDevices(r.Context()).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
@@ -115,7 +117,7 @@ func (t *OverviewRoute) deleteSensorGroup() http.HandlerFunc {
 
 func (t *OverviewRoute) getDevicesTable() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		req := t.client.DevicesApi.ListDevices(r.Context())
+		req := t.coreClient.DevicesApi.ListDevices(r.Context())
 		if r.URL.Query().Has("sensor_group") {
 			sgID, err := strconv.ParseInt(r.URL.Query().Get("sensor_group"), 10, 64)
 			if err != nil {
@@ -143,7 +145,7 @@ func (t *OverviewRoute) getDevicesTable() http.HandlerFunc {
 
 func (t *OverviewRoute) searchSensorGroups() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		res, _, err := t.client.DevicesApi.ListSensorGroups(r.Context()).Execute()
+		res, _, err := t.coreClient.DevicesApi.ListSensorGroups(r.Context()).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
@@ -163,14 +165,14 @@ func (t *OverviewRoute) deviceListPage() http.HandlerFunc {
 				web.HTTPError(w, web.NewError(http.StatusBadRequest, "Sensor Group ID is not an integer", "ERR_BAD_REQUEST"))
 				return
 			}
-			res, _, err := t.client.DevicesApi.GetSensorGroup(r.Context(), sensorGroupID).Execute()
+			res, _, err := t.coreClient.DevicesApi.GetSensorGroup(r.Context(), sensorGroupID).Execute()
 			if err != nil {
 				web.HTTPError(w, fmt.Errorf("error getting sensor group: %w", err))
 				return
 			}
 			page.SensorGroup = res.Data
 		}
-		req := t.client.DevicesApi.ListDevices(r.Context())
+		req := t.coreClient.DevicesApi.ListDevices(r.Context())
 		if page.SensorGroup != nil {
 			req = req.SensorGroup([]int64{page.SensorGroup.GetId()})
 		}
@@ -215,7 +217,7 @@ func (t *OverviewRoute) sensorDetailPage() http.HandlerFunc {
 		device, _ := getDevice(r.Context())
 		sensor, _ := getSensor(r.Context())
 
-		res, _, err := t.client.MeasurementsApi.ListDatastreams(r.Context()).Sensor([]int64{sensor.Id}).Execute()
+		res, _, err := t.measurementsClient.MeasurementsApi.ListDatastreams(r.Context()).Sensor([]int64{sensor.Id}).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
@@ -240,14 +242,16 @@ func (t *OverviewRoute) devicesStreamMap() http.HandlerFunc {
 	}
 
 	return func(w http.ResponseWriter, r *http.Request) {
-		var sgID int64 = 0
+		var sensorGroups []int64
 		if r.URL.Query().Has("sensor_group") {
-			id, err := strconv.ParseInt(r.URL.Query().Get("sensor_group"), 10, 64)
-			if err != nil {
-				web.HTTPError(w, err)
-				return
+			for _, idString := range r.URL.Query()["sensor_group"] {
+				id, err := strconv.ParseInt(idString, 10, 64)
+				if err != nil {
+					web.HTTPError(w, err)
+					return
+				}
+				sensorGroups = append(sensorGroups, id)
 			}
-			sgID = id
 		}
 
 		ws, err := upgrader.Upgrade(w, r, nil)
@@ -256,14 +260,16 @@ func (t *OverviewRoute) devicesStreamMap() http.HandlerFunc {
 			return
 		}
 
-		go func() {
-			ctx, cancel := context.WithCancel(context.TODO())
+		// Build websocket context and copy auth token
+		wsCTX, cancel := context.WithCancel(context.Background())
+		wsCTX = context.WithValue(wsCTX, api.ContextAccessToken, r.Context().Value(api.ContextAccessToken))
+		go func(ctx context.Context) {
 			defer cancel()
 			defer ws.Close()
 			var nextCursor string
 			for {
 				// Start fetching pages of devices and stream them to the client
-				res, _, err := t.client.DevicesApi.ListDevices(ctx).Cursor(nextCursor).SensorGroup([]int64{sgID}).Execute()
+				res, _, err := t.coreClient.DevicesApi.ListDevices(ctx).Cursor(nextCursor).SensorGroup(sensorGroups).Execute()
 				if err != nil {
 					log.Printf("Failed to fetch devices for client: %v\n", err)
 					return
@@ -290,7 +296,7 @@ func (t *OverviewRoute) devicesStreamMap() http.HandlerFunc {
 					return
 				}
 			}
-		}()
+		}(wsCTX)
 	}
 }
 
@@ -324,7 +330,7 @@ func (t *OverviewRoute) overviewDatastream() http.HandlerFunc {
 			end = time.Now()
 		}
 
-		res, _, err := t.client.MeasurementsApi.GetDatastream(r.Context(), chi.URLParam(r, "id")).Execute()
+		res, _, err := t.measurementsClient.MeasurementsApi.GetDatastream(r.Context(), chi.URLParam(r, "id")).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
@@ -368,14 +374,16 @@ func (t *OverviewRoute) overviewDatastreamStream() http.HandlerFunc {
 			return
 		}
 
-		go func() {
-			ctx, cancel := context.WithCancel(context.TODO())
+		// Build websocket context and copy auth token
+		wsCTX := context.WithValue(context.Background(), api.ContextAccessToken, r.Context().Value(api.ContextAccessToken))
+		go func(ctx context.Context) {
+			ctx, cancel := context.WithCancel(ctx)
 			defer cancel()
 			var nextCursor string
 			defer ws.Close()
 			for {
 				// Start fetching pages of measurements and stream them to the client
-				res, _, err := t.client.MeasurementsApi.QueryMeasurements(ctx).
+				res, _, err := t.measurementsClient.MeasurementsApi.QueryMeasurements(ctx).
 					Cursor(nextCursor).
 					Datastream(datastreamID).
 					Start(start).
@@ -405,7 +413,7 @@ func (t *OverviewRoute) overviewDatastreamStream() http.HandlerFunc {
 					return
 				}
 			}
-		}()
+		}(wsCTX)
 	}
 }
 
@@ -431,7 +439,7 @@ func (t *OverviewRoute) resolveDevice(next http.Handler) http.Handler {
 			web.HTTPError(w, err)
 			return
 		}
-		res, _, err := t.client.DevicesApi.GetDevice(r.Context(), deviceID).Execute()
+		res, _, err := t.coreClient.DevicesApi.GetDevice(r.Context(), deviceID).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
diff --git a/services/dashboard/routes/pipelines.go b/services/dashboard/routes/pipelines.go
index fca267a0..29420afd 100644
--- a/services/dashboard/routes/pipelines.go
+++ b/services/dashboard/routes/pipelines.go
@@ -19,10 +19,17 @@ import (
 
 var STORAGE_STEP = env.Could("STORAGE_STEP", "storage")
 
-func CreatePipelinePageHandler(client *api.APIClient) http.Handler {
+type PipelinePageHandler struct {
+	router        chi.Router
+	workersClient *api.APIClient
+	coreClient    *api.APIClient
+}
+
+func CreatePipelinePageHandler(workers, core *api.APIClient) http.Handler {
 	handler := &PipelinePageHandler{
-		router: chi.NewRouter(),
-		client: client,
+		router:        chi.NewRouter(),
+		workersClient: workers,
+		coreClient:    core,
 	}
 
 	// Setup routes
@@ -53,18 +60,13 @@ func CreatePipelinePageHandler(client *api.APIClient) http.Handler {
 	return handler
 }
 
-type PipelinePageHandler struct {
-	router chi.Router
-	client *api.APIClient
-}
-
 func (h PipelinePageHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	h.router.ServeHTTP(w, r)
 }
 
 func (h *PipelinePageHandler) pipelineListPage() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		pipelines, _, err := h.client.PipelinesApi.ListPipelines(r.Context()).Execute()
+		pipelines, _, err := h.coreClient.PipelinesApi.ListPipelines(r.Context()).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
@@ -101,7 +103,7 @@ func (h *PipelinePageHandler) createPipeline() http.HandlerFunc {
 		dto.SetDescription(r.FormValue("pipeline-descr"))
 		dto.SetSteps(stepsFromWorkersList(allWorkers))
 
-		_, resp, err := h.client.PipelinesApi.CreatePipeline(r.Context()).CreatePipelineRequest(dto).Execute()
+		_, resp, err := h.coreClient.PipelinesApi.CreatePipeline(r.Context()).CreatePipelineRequest(dto).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
@@ -219,7 +221,7 @@ func (h *PipelinePageHandler) updatePipeline(next http.Handler) http.Handler {
 		updateDto.SetDescription(pipelineDescr[0])
 		updateDto.SetSteps(stepsFromWorkersList(allWorkers))
 
-		_, resp, err := h.client.PipelinesApi.UpdatePipeline(r.Context(), pipelineId).UpdatePipelineRequest(updateDto).Execute()
+		_, resp, err := h.coreClient.PipelinesApi.UpdatePipeline(r.Context(), pipelineId).UpdatePipelineRequest(updateDto).Execute()
 		if err != nil {
 			SnackbarSomethingWentWrong(w)
 			return
@@ -345,7 +347,7 @@ func stepsFromWorkersList(workers []api.UserWorker) []string {
 
 func (h *PipelinePageHandler) getWorkersTable() func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
-		req := h.client.WorkersApi.ListWorkers(r.Context())
+		req := h.workersClient.WorkersApi.ListWorkers(r.Context())
 		if r.URL.Query().Has("cursor") {
 			req = req.Cursor(r.URL.Query().Get("cursor"))
 		}
@@ -364,7 +366,7 @@ func (h *PipelinePageHandler) getWorkersTable() func(w http.ResponseWriter, r *h
 
 func (h *PipelinePageHandler) getPipelinesTable() func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
-		req := h.client.PipelinesApi.ListPipelines(r.Context())
+		req := h.coreClient.PipelinesApi.ListPipelines(r.Context())
 		if r.URL.Query().Has("cursor") {
 			req = req.Cursor(r.URL.Query().Get("cursor"))
 		}
@@ -384,7 +386,7 @@ func (h *PipelinePageHandler) getPipelinesTable() func(w http.ResponseWriter, r
 
 func (h *PipelinePageHandler) resolvePipeline(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		pipeline, resp, err := h.client.PipelinesApi.GetPipeline(r.Context(), chi.URLParam(r, "pipeline_id")).Execute()
+		pipeline, resp, err := h.coreClient.PipelinesApi.GetPipeline(r.Context(), chi.URLParam(r, "pipeline_id")).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
@@ -401,7 +403,7 @@ func (h *PipelinePageHandler) resolvePipeline(next http.Handler) http.Handler {
 			context.WithValue(
 				r.Context(),
 				ctxPipeline,
-				*pipeline.Data,
+				pipeline.Data,
 			),
 		)
 		next.ServeHTTP(w, r)
@@ -435,7 +437,7 @@ func (h *PipelinePageHandler) resolveWorkersInPipeline(next http.Handler) http.H
 
 func (h *PipelinePageHandler) resolveWorkers(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		workers, resp, err := h.client.WorkersApi.ListWorkers(r.Context()).Cursor("").Execute()
+		workers, resp, err := h.workersClient.WorkersApi.ListWorkers(r.Context()).Cursor("").Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
@@ -459,7 +461,7 @@ func (h *PipelinePageHandler) resolveWorkers(next http.Handler) http.Handler {
 		ctx = context.WithValue(
 			ctx,
 			ctxWorkersCursor,
-			nextCursor,
+			&nextCursor,
 		)
 		r = r.WithContext(ctx)
 		next.ServeHTTP(w, r)
@@ -475,7 +477,7 @@ func (h *PipelinePageHandler) resolveWorkers(next http.Handler) http.Handler {
 func (h *PipelinePageHandler) getWorkersForSteps(r *http.Request, steps []string) ([]api.UserWorker, error) {
 	// Try and fetch all workers from user-workers service.
 	// For any worker not found create a "placeholder" worker
-	res, _, err := h.client.WorkersApi.ListWorkers(r.Context()).Id(steps).Execute()
+	res, _, err := h.workersClient.WorkersApi.ListWorkers(r.Context()).Id(steps).Execute()
 	if err != nil {
 		return nil, err
 	}
diff --git a/services/dashboard/routes/workers.go b/services/dashboard/routes/workers.go
index b7762ed7..85967b4c 100644
--- a/services/dashboard/routes/workers.go
+++ b/services/dashboard/routes/workers.go
@@ -13,14 +13,14 @@ import (
 )
 
 type WorkerPageHandler struct {
-	router chi.Router
-	client *api.APIClient
+	router        chi.Router
+	workersClient *api.APIClient
 }
 
-func CreateWorkerPageHandler(client *api.APIClient) *WorkerPageHandler {
+func CreateWorkerPageHandler(workers *api.APIClient) *WorkerPageHandler {
 	handler := &WorkerPageHandler{
-		router: chi.NewRouter(),
-		client: client,
+		router:        chi.NewRouter(),
+		workersClient: workers,
 	}
 	handler.SetupRoutes(handler.router)
 	return handler
@@ -42,7 +42,7 @@ func (h *WorkerPageHandler) SetupRoutes(r chi.Router) {
 func (h *WorkerPageHandler) listWorkers() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		page := &views.WorkerListPage{}
-		res, _, err := h.client.WorkersApi.ListWorkers(r.Context()).Execute()
+		res, _, err := h.workersClient.WorkersApi.ListWorkers(r.Context()).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
@@ -51,9 +51,7 @@ func (h *WorkerPageHandler) listWorkers() http.HandlerFunc {
 		page.WorkersNextPage = res.Links.GetNext()
 
 		if res.Links.GetNext() != "" {
-			if err == nil {
-				page.WorkersNextPage = views.U("/workers/table?cursor=" + getCursor(res.Links.GetNext()))
-			}
+			page.WorkersNextPage = views.U("/workers/table?cursor=" + getCursor(res.Links.GetNext()))
 		}
 
 		fmt.Println("Cursor", res.Links.GetNext())
@@ -68,7 +66,7 @@ func (h *WorkerPageHandler) listWorkers() http.HandlerFunc {
 func (h *WorkerPageHandler) workersTable() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		fmt.Println("get table")
-		req := h.client.WorkersApi.ListWorkers(r.Context())
+		req := h.workersClient.WorkersApi.ListWorkers(r.Context())
 		if r.URL.Query().Has("cursor") {
 			req = req.Cursor(r.URL.Query().Get("cursor"))
 		}
@@ -93,12 +91,12 @@ func (h *WorkerPageHandler) workerDetails() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		page := &views.WorkerEditorPage{}
 		workerID := chi.URLParam(r, "id")
-		res, _, err := h.client.WorkersApi.GetWorker(r.Context(), workerID).Execute()
+		res, _, err := h.workersClient.WorkersApi.GetWorker(r.Context(), workerID).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
 		}
-		resUC, _, err := h.client.WorkersApi.GetWorkerUserCode(r.Context(), workerID).Execute()
+		resUC, _, err := h.workersClient.WorkersApi.GetWorkerUserCode(r.Context(), workerID).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
@@ -140,7 +138,7 @@ func (h *WorkerPageHandler) updateWorker() http.HandlerFunc {
 			dto.UserCode = &userCode
 		}
 
-		_, _, err := h.client.WorkersApi.UpdateWorker(r.Context(), workerID).UpdateWorkerRequest(dto).Execute()
+		_, _, err := h.workersClient.WorkersApi.UpdateWorker(r.Context(), workerID).UpdateWorkerRequest(dto).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
@@ -179,7 +177,7 @@ func (h *WorkerPageHandler) createWorker() http.HandlerFunc {
 		dto.SetUserCode(r.FormValue("userCode"))
 		dto.SetDescription(r.FormValue("description"))
 
-		_, _, err := h.client.WorkersApi.CreateWorker(r.Context()).CreateUserWorkerRequest(dto).Execute()
+		_, _, err := h.workersClient.WorkersApi.CreateWorker(r.Context()).CreateUserWorkerRequest(dto).Execute()
 		if err != nil {
 			web.HTTPError(w, err)
 			return
diff --git a/services/dashboard/views/pipelineEditPage.qtpl b/services/dashboard/views/pipelineEditPage.qtpl
index c5c18e62..e6204cdc 100644
--- a/services/dashboard/views/pipelineEditPage.qtpl
+++ b/services/dashboard/views/pipelineEditPage.qtpl
@@ -71,16 +71,18 @@
     <div id="workerTable" class="bg-white border rounded-md lg:col-span-3 xl:col-span-3">
         {%= RenderPipelineEditWorkerTable(p.Workers, p.WorkersNextPage) %}
     </div>
-    <div id="sortable-item-staging-template" class="p-2 w-2/4 mt-1.5 mx-auto text-white bg-orange-400 rounded-lg flex justify-between items-center">
-        <input type="hidden"/>
-        <div>
-            <p class="sortable-title text-lg"></p>
-            <p class="sortable-descr text-sm font-thin"></p>
-        </div>
-        <div class="trash-can cursor-pointer h-full w-1/12">
-            <iconify-icon icon="basil:trash-solid" width="100%" height="100%" class="text-white"></iconify-icon>
+    <template id="sortable-item-staging-template">
+        <div class="p-2 w-2/4 mt-1.5 mx-auto text-white bg-orange-400 rounded-lg flex justify-between items-center hidden">
+            <input type="hidden"/>
+            <div>
+                <p class="sortable-title text-lg"></p>
+                <p class="sortable-descr text-sm font-thin"></p>
+            </div>
+            <div class="trash-can cursor-pointer h-full w-1/12">
+                <iconify-icon icon="basil:trash-solid" width="100%" height="100%" class="text-white"></iconify-icon>
+            </div>
         </div>
-    </div>
+    </template>
 </div>
 {% endfunc %}
 
@@ -128,15 +130,15 @@
         function addSortable(workerName, workerId) {
             // Clone the template element and remove the 'hidden' class
             const template = document.getElementById("sortable-item-staging-template");
-            const newItem = template.cloneNode(true);
-            newItem.classList.remove("hidden");
-            newItem.id = "sortable-item-" + workerId;
+            const newItem = template.content.cloneNode(true);
+            newItem.children[0].classList.remove("hidden");
+            newItem.children[0].id = "sortable-item-" + workerId;
 
             const titleElement = newItem.querySelector(".sortable-title");
             titleElement.textContent = workerName;
 
             const trashCanElement = newItem.querySelector(".trash-can");
-            trashCanElement.onclick = function(){ removeFromSortable(workerId); };
+            trashCanElement.addEventListener("click", () => removeFromSortable(workerId));
 
             const sortableForm = document.getElementById("sortableForm");
             const inputElement = newItem.querySelector("input[type='hidden']");
@@ -159,27 +161,16 @@
 
         function getSteps() {
             const form = document.getElementById('sortableForm');
-            console.log(form);
 
             // Create a FormData object from the form
             const formData = new FormData(form);
-            console.log(form.elements);
-            console.log(formData.entries());
-            for (var [key, value] of formData.entries()) { 
-            console.log(key, value);
-            }
-
             let data = {}
             for (var [key, value] of formData.entries()) { 
                 if(!data[key]) {
                     data[key] = [];
                 }
                 data[key].push(value);
-                console.log(key, value, data[key]);
             }
-            console.log(data);
-
-
 
             return data;
         }
diff --git a/services/dashboard/views/pipelineEditPage.qtpl.go b/services/dashboard/views/pipelineEditPage.qtpl.go
index af022d40..04f8aa3e 100644
--- a/services/dashboard/views/pipelineEditPage.qtpl.go
+++ b/services/dashboard/views/pipelineEditPage.qtpl.go
@@ -164,50 +164,52 @@ func (p *PipelineEditPage) StreamBody(qw422016 *qt422016.Writer) {
 //line views/pipelineEditPage.qtpl:72
 	qw422016.N().S(`
     </div>
-    <div id="sortable-item-staging-template" class="p-2 w-2/4 mt-1.5 mx-auto text-white bg-orange-400 rounded-lg flex justify-between items-center">
-        <input type="hidden"/>
-        <div>
-            <p class="sortable-title text-lg"></p>
-            <p class="sortable-descr text-sm font-thin"></p>
-        </div>
-        <div class="trash-can cursor-pointer h-full w-1/12">
-            <iconify-icon icon="basil:trash-solid" width="100%" height="100%" class="text-white"></iconify-icon>
+    <template id="sortable-item-staging-template">
+        <div class="p-2 w-2/4 mt-1.5 mx-auto text-white bg-orange-400 rounded-lg flex justify-between items-center hidden">
+            <input type="hidden"/>
+            <div>
+                <p class="sortable-title text-lg"></p>
+                <p class="sortable-descr text-sm font-thin"></p>
+            </div>
+            <div class="trash-can cursor-pointer h-full w-1/12">
+                <iconify-icon icon="basil:trash-solid" width="100%" height="100%" class="text-white"></iconify-icon>
+            </div>
         </div>
-    </div>
+    </template>
 </div>
 `)
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 }
 
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 func (p *PipelineEditPage) WriteBody(qq422016 qtio422016.Writer) {
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 	p.StreamBody(qw422016)
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 	qt422016.ReleaseWriter(qw422016)
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 }
 
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 func (p *PipelineEditPage) Body() string {
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 	p.WriteBody(qb422016)
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 	qs422016 := string(qb422016.B)
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 	return qs422016
-//line views/pipelineEditPage.qtpl:85
+//line views/pipelineEditPage.qtpl:87
 }
 
-//line views/pipelineEditPage.qtpl:87
+//line views/pipelineEditPage.qtpl:89
 func StreamRenderPipelineSteps(qw422016 *qt422016.Writer, pipeline *api.Pipeline, workers *[]api.UserWorker) {
-//line views/pipelineEditPage.qtpl:87
+//line views/pipelineEditPage.qtpl:89
 	qw422016.N().S(`
     <script>
         htmx.onLoad(function(content) {
@@ -252,15 +254,15 @@ func StreamRenderPipelineSteps(qw422016 *qt422016.Writer, pipeline *api.Pipeline
         function addSortable(workerName, workerId) {
             // Clone the template element and remove the 'hidden' class
             const template = document.getElementById("sortable-item-staging-template");
-            const newItem = template.cloneNode(true);
-            newItem.classList.remove("hidden");
-            newItem.id = "sortable-item-" + workerId;
+            const newItem = template.content.cloneNode(true);
+            newItem.children[0].classList.remove("hidden");
+            newItem.children[0].id = "sortable-item-" + workerId;
 
             const titleElement = newItem.querySelector(".sortable-title");
             titleElement.textContent = workerName;
 
             const trashCanElement = newItem.querySelector(".trash-can");
-            trashCanElement.onclick = function(){ removeFromSortable(workerId); };
+            trashCanElement.addEventListener("click", () => removeFromSortable(workerId));
 
             const sortableForm = document.getElementById("sortableForm");
             const inputElement = newItem.querySelector("input[type='hidden']");
@@ -283,27 +285,16 @@ func StreamRenderPipelineSteps(qw422016 *qt422016.Writer, pipeline *api.Pipeline
 
         function getSteps() {
             const form = document.getElementById('sortableForm');
-            console.log(form);
 
             // Create a FormData object from the form
             const formData = new FormData(form);
-            console.log(form.elements);
-            console.log(formData.entries());
-            for (var [key, value] of formData.entries()) { 
-            console.log(key, value);
-            }
-
             let data = {}
             for (var [key, value] of formData.entries()) { 
                 if(!data[key]) {
                     data[key] = [];
                 }
                 data[key].push(value);
-                console.log(key, value, data[key]);
             }
-            console.log(data);
-
-
 
             return data;
         }
@@ -322,186 +313,186 @@ func StreamRenderPipelineSteps(qw422016 *qt422016.Writer, pipeline *api.Pipeline
     </div>
     <form id="sortableForm" name="sortable" class="sortable" hx-indicator="#stepsIndicator" hx-vals="js:{steps: getSteps()}"
         `)
-//line views/pipelineEditPage.qtpl:200
+//line views/pipelineEditPage.qtpl:191
 	if pipeline == nil {
-//line views/pipelineEditPage.qtpl:200
+//line views/pipelineEditPage.qtpl:191
 		qw422016.N().S(`
             hx-patch="`)
-//line views/pipelineEditPage.qtpl:201
+//line views/pipelineEditPage.qtpl:192
 		qw422016.E().S(U("/pipelines/validate"))
-//line views/pipelineEditPage.qtpl:201
+//line views/pipelineEditPage.qtpl:192
 		qw422016.N().S(`" hx-trigger="form-updated"
         `)
-//line views/pipelineEditPage.qtpl:202
+//line views/pipelineEditPage.qtpl:193
 	}
-//line views/pipelineEditPage.qtpl:202
+//line views/pipelineEditPage.qtpl:193
 	qw422016.N().S(`>
         `)
-//line views/pipelineEditPage.qtpl:203
+//line views/pipelineEditPage.qtpl:194
 	if workers != nil {
-//line views/pipelineEditPage.qtpl:203
+//line views/pipelineEditPage.qtpl:194
 		qw422016.N().S(`
             `)
-//line views/pipelineEditPage.qtpl:204
+//line views/pipelineEditPage.qtpl:195
 		StreamRenderPipelineStepsSortable(qw422016, *workers)
-//line views/pipelineEditPage.qtpl:204
+//line views/pipelineEditPage.qtpl:195
 		qw422016.N().S(`
         `)
-//line views/pipelineEditPage.qtpl:205
+//line views/pipelineEditPage.qtpl:196
 	}
-//line views/pipelineEditPage.qtpl:205
+//line views/pipelineEditPage.qtpl:196
 	qw422016.N().S(`
     </form>
 `)
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 }
 
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 func WriteRenderPipelineSteps(qq422016 qtio422016.Writer, pipeline *api.Pipeline, workers *[]api.UserWorker) {
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 	StreamRenderPipelineSteps(qw422016, pipeline, workers)
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 	qt422016.ReleaseWriter(qw422016)
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 }
 
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 func RenderPipelineSteps(pipeline *api.Pipeline, workers *[]api.UserWorker) string {
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 	WriteRenderPipelineSteps(qb422016, pipeline, workers)
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 	qs422016 := string(qb422016.B)
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 	return qs422016
-//line views/pipelineEditPage.qtpl:207
+//line views/pipelineEditPage.qtpl:198
 }
 
-//line views/pipelineEditPage.qtpl:209
+//line views/pipelineEditPage.qtpl:200
 func StreamRenderPipelineStepsSortable(qw422016 *qt422016.Writer, steps []api.UserWorker) {
-//line views/pipelineEditPage.qtpl:209
+//line views/pipelineEditPage.qtpl:200
 	qw422016.N().S(`
     `)
-//line views/pipelineEditPage.qtpl:210
+//line views/pipelineEditPage.qtpl:201
 	for ix, step := range steps {
-//line views/pipelineEditPage.qtpl:210
+//line views/pipelineEditPage.qtpl:201
 		qw422016.N().S(`
         <div id="sortable-item-`)
-//line views/pipelineEditPage.qtpl:211
+//line views/pipelineEditPage.qtpl:202
 		qw422016.E().S(step.Id)
-//line views/pipelineEditPage.qtpl:211
+//line views/pipelineEditPage.qtpl:202
 		qw422016.N().S(`" class="p-2 w-2/4 mt-1.5 mx-auto text-white bg-secondary-600 rounded-lg flex justify-between items-center">
             <input type="hidden" name="`)
-//line views/pipelineEditPage.qtpl:212
+//line views/pipelineEditPage.qtpl:203
 		qw422016.E().S(step.Id)
-//line views/pipelineEditPage.qtpl:212
+//line views/pipelineEditPage.qtpl:203
 		qw422016.N().S(`" value="`)
-//line views/pipelineEditPage.qtpl:212
+//line views/pipelineEditPage.qtpl:203
 		qw422016.N().D(ix)
-//line views/pipelineEditPage.qtpl:212
+//line views/pipelineEditPage.qtpl:203
 		qw422016.N().S(`" />
             <div>
                 <p class="text-lg">`)
-//line views/pipelineEditPage.qtpl:214
+//line views/pipelineEditPage.qtpl:205
 		qw422016.E().S(step.Name)
-//line views/pipelineEditPage.qtpl:214
+//line views/pipelineEditPage.qtpl:205
 		qw422016.N().S(` v`)
-//line views/pipelineEditPage.qtpl:214
+//line views/pipelineEditPage.qtpl:205
 		qw422016.E().V(step.Revision)
-//line views/pipelineEditPage.qtpl:214
+//line views/pipelineEditPage.qtpl:205
 		qw422016.N().S(`</p>
                 <p class="text-sm font-thin">`)
-//line views/pipelineEditPage.qtpl:215
+//line views/pipelineEditPage.qtpl:206
 		qw422016.E().S(step.Description)
-//line views/pipelineEditPage.qtpl:215
+//line views/pipelineEditPage.qtpl:206
 		qw422016.N().S(`</p>
             </div>
             <div class="cursor-pointer h-full w-1/12" onclick="removeFromSortable('`)
-//line views/pipelineEditPage.qtpl:217
+//line views/pipelineEditPage.qtpl:208
 		qw422016.E().S(step.Id)
-//line views/pipelineEditPage.qtpl:217
+//line views/pipelineEditPage.qtpl:208
 		qw422016.N().S(`')">
                 <iconify-icon icon="basil:trash-solid" width="100%" height="100%" class="text-white"></iconify-icon>
             </div>
         </div>
     `)
-//line views/pipelineEditPage.qtpl:221
+//line views/pipelineEditPage.qtpl:212
 	}
-//line views/pipelineEditPage.qtpl:221
+//line views/pipelineEditPage.qtpl:212
 	qw422016.N().S(`
 `)
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 }
 
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 func WriteRenderPipelineStepsSortable(qq422016 qtio422016.Writer, steps []api.UserWorker) {
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 	StreamRenderPipelineStepsSortable(qw422016, steps)
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 	qt422016.ReleaseWriter(qw422016)
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 }
 
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 func RenderPipelineStepsSortable(steps []api.UserWorker) string {
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 	WriteRenderPipelineStepsSortable(qb422016, steps)
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 	qs422016 := string(qb422016.B)
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 	return qs422016
-//line views/pipelineEditPage.qtpl:222
+//line views/pipelineEditPage.qtpl:213
 }
 
-//line views/pipelineEditPage.qtpl:224
+//line views/pipelineEditPage.qtpl:215
 func StreamRenderPipelineDetailEditor(qw422016 *qt422016.Writer) {
-//line views/pipelineEditPage.qtpl:224
+//line views/pipelineEditPage.qtpl:215
 	qw422016.N().S(`
  // TODO
 `)
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 }
 
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 func WriteRenderPipelineDetailEditor(qq422016 qtio422016.Writer) {
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 	StreamRenderPipelineDetailEditor(qw422016)
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 	qt422016.ReleaseWriter(qw422016)
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 }
 
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 func RenderPipelineDetailEditor() string {
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 	WriteRenderPipelineDetailEditor(qb422016)
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 	qs422016 := string(qb422016.B)
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 	return qs422016
-//line views/pipelineEditPage.qtpl:226
+//line views/pipelineEditPage.qtpl:217
 }
 
-//line views/pipelineEditPage.qtpl:228
+//line views/pipelineEditPage.qtpl:219
 func StreamRenderPipelineEditWorkerTable(qw422016 *qt422016.Writer, workers []api.UserWorker, nextPage string) {
-//line views/pipelineEditPage.qtpl:228
+//line views/pipelineEditPage.qtpl:219
 	qw422016.N().S(`
     <table class="w-full text-sm border-separate border-spacing-0" id="device-table">
         <thead class="text-left text-slate-500 sticky top-0 bg-white">
@@ -528,110 +519,110 @@ func StreamRenderPipelineEditWorkerTable(qw422016 *qt422016.Writer, workers []ap
         </thead>
         <tbody>
             `)
-//line views/pipelineEditPage.qtpl:253
+//line views/pipelineEditPage.qtpl:244
 	StreamRenderPipelineEditWorkerTableRows(qw422016, workers, nextPage)
-//line views/pipelineEditPage.qtpl:253
+//line views/pipelineEditPage.qtpl:244
 	qw422016.N().S(`
         </tbody>
     </table>
 `)
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 }
 
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 func WriteRenderPipelineEditWorkerTable(qq422016 qtio422016.Writer, workers []api.UserWorker, nextPage string) {
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 	StreamRenderPipelineEditWorkerTable(qw422016, workers, nextPage)
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 	qt422016.ReleaseWriter(qw422016)
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 }
 
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 func RenderPipelineEditWorkerTable(workers []api.UserWorker, nextPage string) string {
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 	WriteRenderPipelineEditWorkerTable(qb422016, workers, nextPage)
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 	qs422016 := string(qb422016.B)
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 	return qs422016
-//line views/pipelineEditPage.qtpl:256
+//line views/pipelineEditPage.qtpl:247
 }
 
-//line views/pipelineEditPage.qtpl:258
+//line views/pipelineEditPage.qtpl:249
 func StreamRenderPipelineEditWorkerTableRows(qw422016 *qt422016.Writer, workers []api.UserWorker, nextPage string) {
-//line views/pipelineEditPage.qtpl:258
+//line views/pipelineEditPage.qtpl:249
 	qw422016.N().S(`
     `)
-//line views/pipelineEditPage.qtpl:259
+//line views/pipelineEditPage.qtpl:250
 	for ix, worker := range workers {
-//line views/pipelineEditPage.qtpl:259
+//line views/pipelineEditPage.qtpl:250
 		qw422016.N().S(`
     <tr
         class="hover:bg-slate-50 group"
         `)
-//line views/pipelineEditPage.qtpl:262
+//line views/pipelineEditPage.qtpl:253
 		if nextPage != "" && ix == len(workers)-1 {
-//line views/pipelineEditPage.qtpl:262
+//line views/pipelineEditPage.qtpl:253
 			qw422016.N().S(`
         hx-trigger="revealed"
         hx-target="this"
         hx-swap="afterend"
         hx-get="`)
-//line views/pipelineEditPage.qtpl:266
+//line views/pipelineEditPage.qtpl:257
 			qw422016.E().S(nextPage)
-//line views/pipelineEditPage.qtpl:266
+//line views/pipelineEditPage.qtpl:257
 			qw422016.N().S(`"
         `)
-//line views/pipelineEditPage.qtpl:267
+//line views/pipelineEditPage.qtpl:258
 		}
-//line views/pipelineEditPage.qtpl:267
+//line views/pipelineEditPage.qtpl:258
 		qw422016.N().S(`
     >
         <td class="border-b"><a
             class="flex items-center px-4 h-10 text-primary-700 group-hover:underline"
             href="`)
-//line views/pipelineEditPage.qtpl:271
+//line views/pipelineEditPage.qtpl:262
 		qw422016.E().S(U("/workers/%s", worker.Id))
-//line views/pipelineEditPage.qtpl:271
+//line views/pipelineEditPage.qtpl:262
 		qw422016.N().S(`"
             hx-target="main"
         >`)
-//line views/pipelineEditPage.qtpl:273
+//line views/pipelineEditPage.qtpl:264
 		qw422016.E().S(worker.Name)
-//line views/pipelineEditPage.qtpl:273
+//line views/pipelineEditPage.qtpl:264
 		qw422016.N().S(`</a></td>
         <td class="px-4 h-10 border-b">`)
-//line views/pipelineEditPage.qtpl:274
+//line views/pipelineEditPage.qtpl:265
 		qw422016.N().D(int(worker.Revision))
-//line views/pipelineEditPage.qtpl:274
+//line views/pipelineEditPage.qtpl:265
 		qw422016.N().S(`</td>
         <td class="px-4 h-10 border-b">`)
-//line views/pipelineEditPage.qtpl:275
+//line views/pipelineEditPage.qtpl:266
 		qw422016.E().S(worker.Id)
-//line views/pipelineEditPage.qtpl:275
+//line views/pipelineEditPage.qtpl:266
 		qw422016.N().S(`</td>
         <td class="px-4 h-10 border-b">`)
-//line views/pipelineEditPage.qtpl:276
+//line views/pipelineEditPage.qtpl:267
 		qw422016.E().S(worker.Description)
-//line views/pipelineEditPage.qtpl:276
+//line views/pipelineEditPage.qtpl:267
 		qw422016.N().S(`</td>
         <td class="px-4 h-10 border-b">Python</td>
         <td class="px-4 h-10 border-b">
             <button onclick="addSortable('`)
-//line views/pipelineEditPage.qtpl:279
+//line views/pipelineEditPage.qtpl:270
 		qw422016.E().S(worker.Name)
-//line views/pipelineEditPage.qtpl:279
+//line views/pipelineEditPage.qtpl:270
 		qw422016.N().S(`', '`)
-//line views/pipelineEditPage.qtpl:279
+//line views/pipelineEditPage.qtpl:270
 		qw422016.E().S(worker.Id)
-//line views/pipelineEditPage.qtpl:279
+//line views/pipelineEditPage.qtpl:270
 		qw422016.N().S(`')" class="text-xs bg-emerald-400 hover:bg-emerald-500 text-white border border-emerald-500 rounded px-2 py-1">
                 Add
             </button>              
@@ -639,41 +630,41 @@ func StreamRenderPipelineEditWorkerTableRows(qw422016 *qt422016.Writer, workers
         <!-- opacity-50 cursor-not-allowed pointer-events-none  -->
     </tr>
     `)
-//line views/pipelineEditPage.qtpl:285
+//line views/pipelineEditPage.qtpl:276
 	}
-//line views/pipelineEditPage.qtpl:285
+//line views/pipelineEditPage.qtpl:276
 	qw422016.N().S(`
 `)
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 }
 
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 func WriteRenderPipelineEditWorkerTableRows(qq422016 qtio422016.Writer, workers []api.UserWorker, nextPage string) {
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 	StreamRenderPipelineEditWorkerTableRows(qw422016, workers, nextPage)
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 	qt422016.ReleaseWriter(qw422016)
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 }
 
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 func RenderPipelineEditWorkerTableRows(workers []api.UserWorker, nextPage string) string {
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 	qb422016 := qt422016.AcquireByteBuffer()
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 	WriteRenderPipelineEditWorkerTableRows(qb422016, workers, nextPage)
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 	qs422016 := string(qb422016.B)
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 	qt422016.ReleaseByteBuffer(qb422016)
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 	return qs422016
-//line views/pipelineEditPage.qtpl:286
+//line views/pipelineEditPage.qtpl:277
 }
 
-//line views/pipelineEditPage.qtpl:289
+//line views/pipelineEditPage.qtpl:280
 type PipelineEditPage struct {
 	BasePage
 	Pipeline          *api.Pipeline
diff --git a/services/tenants/apikeys/application.go b/services/tenants/apikeys/application.go
index 86f63e1b..e2644691 100644
--- a/services/tenants/apikeys/application.go
+++ b/services/tenants/apikeys/application.go
@@ -32,19 +32,19 @@ func NewAPIKeyService(tenantStore TenantStore, apiKeyStore ApiKeyStore) *Service
 	}
 }
 
-func (s *Service) ListAPIKeys(filter Filter, p pagination.Request) (*pagination.Page[ApiKeyDTO], error) {
+func (s *Service) ListAPIKeys(ctx context.Context, filter Filter, p pagination.Request) (*pagination.Page[ApiKeyDTO], error) {
 	return s.apiKeyStore.List(filter, p)
 }
 
 // Revokes an API key, returns ErrKeyNotFound if the given key was not found in the apiKeyStore
-func (s *Service) RevokeApiKey(apiKeyId int64) error {
+func (s *Service) RevokeApiKey(ctx context.Context, apiKeyId int64) error {
 	return s.apiKeyStore.DeleteApiKey(apiKeyId)
 }
 
 // Creates a new API key for the given tenant and with the given expiration date.
 // Returns the api key as: 'apiKeyId:apiKey' encoded to a base64 string.
 // Fails if the tenant is not active
-func (s *Service) GenerateNewApiKey(name string, tenantId int64, permissions auth.Permissions, expirationDate *time.Time) (string, error) {
+func (s *Service) GenerateNewApiKey(ctx context.Context, name string, tenantId int64, permissions auth.Permissions, expirationDate *time.Time) (string, error) {
 	if err := permissions.Validate(); err != nil {
 		return "", fmt.Errorf("%w: %w", ErrPermissionsInvalid, err)
 	}
@@ -81,7 +81,7 @@ func (s *Service) GenerateNewApiKey(name string, tenantId int64, permissions aut
 
 // Authenticates a given API key. Input must be 'apiKeyId:apiKey' encoded to a base64 string
 // API key is valid if it is the correct api key id and api key combination and if the attached tenant is active
-func (s *Service) AuthenticateApiKey(base64IdAndKeyCombination string) (ApiKeyAuthenticationDTO, error) {
+func (s *Service) AuthenticateApiKey(ctx context.Context, base64IdAndKeyCombination string) (ApiKeyAuthenticationDTO, error) {
 	apiKeyId, apiKey, err := apiKeyAndIdFromBase64(base64IdAndKeyCombination)
 	if err != nil {
 		return ApiKeyAuthenticationDTO{}, ErrInvalidEncoding
@@ -92,7 +92,7 @@ func (s *Service) AuthenticateApiKey(base64IdAndKeyCombination string) (ApiKeyAu
 	}
 	if hashed.IsExpired() {
 		log.Println("[Info] detected expired API key, deleting")
-		if err := s.RevokeApiKey(apiKeyId); err != nil {
+		if err := s.RevokeApiKey(ctx, apiKeyId); err != nil {
 			log.Printf("[Warning] couldn't cleanup expired API key: '%s'\n", err)
 		}
 		return ApiKeyAuthenticationDTO{}, ErrKeyNotFound
@@ -120,7 +120,7 @@ func (s *Service) GetAPIKey(ctx context.Context, id int64) (*HashedApiKey, error
 	}
 	if hashed.IsExpired() {
 		log.Println("[Info] detected expired API key, deleting")
-		if err := s.RevokeApiKey(id); err != nil {
+		if err := s.RevokeApiKey(ctx, id); err != nil {
 			log.Printf("[Warning] couldn't cleanup expired API key: '%s'\n", err)
 		}
 		return nil, ErrKeyNotFound
diff --git a/services/tenants/apikeys/application_test.go b/services/tenants/apikeys/application_test.go
index c89a22c9..3638b846 100644
--- a/services/tenants/apikeys/application_test.go
+++ b/services/tenants/apikeys/application_test.go
@@ -1,6 +1,7 @@
 package apikeys_test
 
 import (
+	"context"
 	"encoding/base64"
 	"fmt"
 	"testing"
@@ -42,7 +43,7 @@ func TestGenerateNewApiKeyCreatesNewApiKey(t *testing.T) {
 	}
 	s := apikeys.NewAPIKeyService(tenantStore, apiKeyStore)
 	// Act
-	res, err := s.GenerateNewApiKey("whatever", 905, auth.Permissions{auth.READ_DEVICES}, &exp)
+	res, err := s.GenerateNewApiKey(context.Background(), "whatever", 905, auth.Permissions{auth.READ_DEVICES}, &exp)
 
 	// Assert
 	assert.NoError(t, err)
@@ -78,7 +79,7 @@ func TestGenerateNewAPIKeyNameAndTenantCombinationNotUnique(t *testing.T) {
 	s := apikeys.NewAPIKeyService(tenantStore, apiKeyStore)
 
 	// Act
-	res, err := s.GenerateNewApiKey("whatever", 905, auth.Permissions{auth.READ_API_KEYS}, &exp)
+	res, err := s.GenerateNewApiKey(context.Background(), "whatever", 905, auth.Permissions{auth.READ_API_KEYS}, &exp)
 
 	// Assert
 	assert.ErrorIs(t, err, apikeys.ErrKeyNameTenantIDCombinationNotUnique)
@@ -108,7 +109,7 @@ func TestGenerateNewAPIKeyCheckCombinationUniqueErrorOccurs(t *testing.T) {
 	s := apikeys.NewAPIKeyService(tenantStore, apiKeyStore)
 
 	// Act
-	res, err := s.GenerateNewApiKey("whatever", 905, auth.Permissions{auth.READ_DEVICES}, &exp)
+	res, err := s.GenerateNewApiKey(context.Background(), "whatever", 905, auth.Permissions{auth.READ_DEVICES}, &exp)
 
 	// Assert
 	assert.Error(t, err)
@@ -144,7 +145,7 @@ func TestGenerateNewApiKeyErrorOccursWhileAddingApiKeyToStore(t *testing.T) {
 	s := apikeys.NewAPIKeyService(tenantStore, apiKeyStore)
 
 	// Act
-	res, err := s.GenerateNewApiKey("whatever", 905, auth.Permissions{auth.READ_DEVICES}, nil)
+	res, err := s.GenerateNewApiKey(context.Background(), "whatever", 905, auth.Permissions{auth.READ_DEVICES}, nil)
 
 	// Assert
 	assert.Error(t, err)
@@ -160,7 +161,7 @@ func TestGenerateNewApiKeyPermissionsContains1InvalidPermission(t *testing.T) {
 	s := apikeys.NewAPIKeyService(tenantStore, apiKeyStore)
 
 	// Act
-	res, err := s.GenerateNewApiKey("whatever", 905, auth.Permissions{auth.READ_API_KEYS, auth.READ_DEVICES, auth.Permission("invalidpermission")}, nil)
+	res, err := s.GenerateNewApiKey(context.Background(), "whatever", 905, auth.Permissions{auth.READ_API_KEYS, auth.READ_DEVICES, auth.Permission("invalidpermission")}, nil)
 
 	// Assert
 	assert.ErrorIs(t, err, apikeys.ErrPermissionsInvalid)
@@ -182,7 +183,7 @@ func TestGenerateNewApiKeyErrorOccursWhenRetrievingTenant(t *testing.T) {
 	s := apikeys.NewAPIKeyService(tenantStore, &ApiKeyStoreMock{})
 
 	// Act
-	res, err := s.GenerateNewApiKey("whatever", 905, auth.Permissions{auth.READ_DEVICES}, nil)
+	res, err := s.GenerateNewApiKey(context.Background(), "whatever", 905, auth.Permissions{auth.READ_DEVICES}, nil)
 
 	// Assert
 	assert.Error(t, err)
@@ -201,7 +202,7 @@ func TestGenerateNewApiKeyTenantDoesNotExist(t *testing.T) {
 	s := apikeys.NewAPIKeyService(tenantStore, &ApiKeyStoreMock{})
 
 	// Act
-	res, err := s.GenerateNewApiKey("whatever", 334, auth.Permissions{auth.READ_DEVICES}, nil)
+	res, err := s.GenerateNewApiKey(context.Background(), "whatever", 334, auth.Permissions{auth.READ_DEVICES}, nil)
 
 	// Assert
 	assert.ErrorIs(t, err, apikeys.ErrTenantIsNotValid)
@@ -222,7 +223,7 @@ func TestGenerateNewApiKeyTenantIsNottenantsActive(t *testing.T) {
 	s := apikeys.NewAPIKeyService(tenantStore, &ApiKeyStoreMock{})
 
 	// Act
-	res, err := s.GenerateNewApiKey("whatever", 334, auth.Permissions{auth.READ_DEVICES}, nil)
+	res, err := s.GenerateNewApiKey(context.Background(), "whatever", 334, auth.Permissions{auth.READ_DEVICES}, nil)
 
 	// Assert
 	assert.ErrorIs(t, err, apikeys.ErrTenantIsNotValid)
@@ -241,7 +242,7 @@ func TestRevokeApiKeyDeletesKey(t *testing.T) {
 	s := apikeys.NewAPIKeyService(&TenantStoreMock{}, apiKeyStore)
 
 	// Act
-	err := s.RevokeApiKey(665213432)
+	err := s.RevokeApiKey(context.Background(), 665213432)
 
 	// Assert
 	assert.NoError(t, err)
@@ -259,7 +260,7 @@ func TestRevokeApiKeyErrorOccurs(t *testing.T) {
 	s := apikeys.NewAPIKeyService(&TenantStoreMock{}, apiKeyStore)
 
 	// Act
-	err := s.RevokeApiKey(83245345)
+	err := s.RevokeApiKey(context.Background(), 83245345)
 
 	// Assert
 	assert.Error(t, err)
@@ -277,7 +278,7 @@ func TestRevokeApiKeyWasNotDeletedByStore(t *testing.T) {
 	s := apikeys.NewAPIKeyService(&TenantStoreMock{}, apiKeyStore)
 
 	// Act
-	err := s.RevokeApiKey(83245345)
+	err := s.RevokeApiKey(context.Background(), 83245345)
 
 	// Assert
 	assert.ErrorIs(t, err, apikeys.ErrKeyNotFound)
@@ -297,7 +298,7 @@ func TestValidateApiKeyInvalidEncoding(t *testing.T) {
 		t.Run(scenario, func(t *testing.T) {
 			// Act
 			s := &apikeys.Service{}
-			res, err := s.AuthenticateApiKey(input)
+			res, err := s.AuthenticateApiKey(context.Background(), input)
 
 			// Assert
 			assert.EqualValues(t, 0, res.TenantID)
@@ -318,7 +319,7 @@ func TestValidateApiKeyErrorOccursWhileRetrievingKey(t *testing.T) {
 	s := apikeys.NewAPIKeyService(&TenantStoreMock{}, apiKeyStore)
 
 	// Act
-	res, err := s.AuthenticateApiKey(asBase64("43214:somevalidapikey"))
+	res, err := s.AuthenticateApiKey(context.Background(), asBase64("43214:somevalidapikey"))
 
 	// Assert
 	assert.EqualValues(t, 0, res.TenantID)
@@ -344,7 +345,7 @@ func TestValidateApiKeyInvalidKey(t *testing.T) {
 	s := apikeys.NewAPIKeyService(&TenantStoreMock{}, apiKeyStore)
 
 	// Act
-	res, err := s.AuthenticateApiKey(asBase64("43214:someinvalidapikey"))
+	res, err := s.AuthenticateApiKey(context.Background(), asBase64("43214:someinvalidapikey"))
 
 	// Assert
 	assert.EqualValues(t, 0, res.TenantID)
@@ -376,7 +377,7 @@ func TestValidateApiKeyKeyIsExpired(t *testing.T) {
 	s := apikeys.NewAPIKeyService(&TenantStoreMock{}, apiKeyStore)
 
 	// Act
-	res, err := s.AuthenticateApiKey(asBase64("43214:kayJhmgiCNNQAKwtvewxN6BWSTiEINOy"))
+	res, err := s.AuthenticateApiKey(context.Background(), asBase64("43214:kayJhmgiCNNQAKwtvewxN6BWSTiEINOy"))
 
 	// Assert
 	assert.EqualValues(t, 0, res.TenantID)
@@ -409,7 +410,7 @@ func TestValidateApiKeyKeyIsExpiredDeleteErrorOccurs(t *testing.T) {
 	s := apikeys.NewAPIKeyService(&TenantStoreMock{}, apiKeyStore)
 
 	// Act
-	res, err := s.AuthenticateApiKey(asBase64("43214:kayJhmgiCNNQAKwtvewxN6BWSTiEINOy"))
+	res, err := s.AuthenticateApiKey(context.Background(), asBase64("43214:kayJhmgiCNNQAKwtvewxN6BWSTiEINOy"))
 
 	// Assert
 	assert.EqualValues(t, 0, res.TenantID)
@@ -436,7 +437,7 @@ func TestValidateApiKeyValidKey(t *testing.T) {
 	s := apikeys.NewAPIKeyService(&TenantStoreMock{}, apiKeyStore)
 
 	// Act
-	res, err := s.AuthenticateApiKey(asBase64("43214:kayJhmgiCNNQAKwtvewxN6BWSTiEINOy"))
+	res, err := s.AuthenticateApiKey(context.Background(), asBase64("43214:kayJhmgiCNNQAKwtvewxN6BWSTiEINOy"))
 
 	// Assert
 	assert.EqualValues(t, 534, res.TenantID)
diff --git a/services/tenants/main.go b/services/tenants/main.go
index 9fe11900..de8ec200 100644
--- a/services/tenants/main.go
+++ b/services/tenants/main.go
@@ -86,17 +86,17 @@ func runAPI(errC chan<- error, db *sqlx.DB) (func(context.Context), error) {
 	// Setup Tenants service
 	tenantStore := tenantsinfra.NewTenantsStorePSQL(db)
 	kratosAdmin := tenantsinfra.NewKratosUserValidator(KRATOS_ADMIN_API)
-	tenantSvc := tenants.NewTenantService(tenantStore, kratosAdmin)
-	_ = tenantstransports.NewTenantsHTTP(r, tenantSvc, HTTP_API_BASE)
+	tenantSVC := tenants.NewTenantService(tenantStore, kratosAdmin)
+	_ = tenantstransports.NewTenantsHTTP(r, tenantSVC, HTTP_API_BASE)
 
 	// Setup API keys service
 	apiKeyStore := tenantsinfra.NewAPIKeyStorePSQL(db)
-	apiKeySvc := apikeys.NewAPIKeyService(tenantStore, apiKeyStore)
-	_ = tenantstransports.NewAPIKeysHTTP(r, apiKeySvc, HTTP_API_BASE)
+	apiKeySVC := apikeys.NewAPIKeyService(tenantStore, apiKeyStore)
+	_ = tenantstransports.NewAPIKeysHTTP(r, apiKeySVC, HTTP_API_BASE)
 
 	// Setup oathkeeper endpoint
 	userPreferences := sessions.NewUserPreferenceService(tenantStore)
-	oathkeeperTransport := tenantstransports.NewOathkeeperEndpoint(userPreferences, tenantSvc)
+	oathkeeperTransport := tenantstransports.NewOathkeeperEndpoint(userPreferences, tenantSVC)
 	r.Mount("/oathkeeper", oathkeeperTransport)
 
 	// Run the HTTP Server
@@ -133,7 +133,6 @@ func runWebUI(errC chan<- error, db *sqlx.DB) (func(context.Context), error) {
 	ui, err := webui.New(
 		HTTP_WEBUI_BASE,
 		AUTH_JWKS_URL,
-		SB_API,
 		tenantSvc,
 		apiKeySvc,
 		userPreferences,
diff --git a/services/tenants/transports/apikeys_http.go b/services/tenants/transports/apikeys_http.go
index 0e07f921..f6397eac 100644
--- a/services/tenants/transports/apikeys_http.go
+++ b/services/tenants/transports/apikeys_http.go
@@ -62,7 +62,7 @@ func (t *APIKeysHTTPTransport) httpRevokeApiKey() http.HandlerFunc {
 			})
 			return
 		}
-		if err = t.apiKeySvc.RevokeApiKey(apiKeyId); err != nil {
+		if err = t.apiKeySvc.RevokeApiKey(r.Context(), apiKeyId); err != nil {
 			if errors.Is(err, apikeys.ErrKeyNotFound) {
 				web.HTTPResponse(w, http.StatusNotFound, web.APIResponseAny{
 					Message: "Key does not exist",
@@ -124,7 +124,7 @@ func (t *APIKeysHTTPTransport) httpCreateApiKey() http.HandlerFunc {
 			return
 		}
 
-		apiKey, err := t.apiKeySvc.GenerateNewApiKey(params.Name, params.TenantID, params.Permissions, params.ExpirationDate)
+		apiKey, err := t.apiKeySvc.GenerateNewApiKey(r.Context(), params.Name, params.TenantID, params.Permissions, params.ExpirationDate)
 		if err != nil {
 			if errors.Is(err, apikeys.ErrTenantIsNotValid) {
 				web.HTTPResponse(w, http.StatusNotFound, web.APIResponseAny{
@@ -158,7 +158,7 @@ func (t *APIKeysHTTPTransport) httpAuthenticateApiKey() http.HandlerFunc {
 			return
 		}
 		idAndKeyCombination := strings.TrimPrefix(authHeader, "Bearer ")
-		keyInfo, err := t.apiKeySvc.AuthenticateApiKey(idAndKeyCombination)
+		keyInfo, err := t.apiKeySvc.AuthenticateApiKey(r.Context(), idAndKeyCombination)
 		if err == nil {
 			session := AuthenticationSession{
 				Subject: "",
@@ -219,7 +219,7 @@ func (t *APIKeysHTTPTransport) httpListApiKeys() http.HandlerFunc {
 			web.HTTPError(rw, web.NewError(http.StatusBadRequest, "invalid params", ""))
 			return
 		}
-		page, err := t.apiKeySvc.ListAPIKeys(params.Filter, params.Request)
+		page, err := t.apiKeySvc.ListAPIKeys(r.Context(), params.Filter, params.Request)
 		if err != nil {
 			web.HTTPError(rw, err)
 			return
@@ -230,9 +230,9 @@ func (t *APIKeysHTTPTransport) httpListApiKeys() http.HandlerFunc {
 }
 
 type ApiKeyService interface {
-	AuthenticateApiKey(base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error)
-	GenerateNewApiKey(name string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error)
-	RevokeApiKey(id int64) error
-	ListAPIKeys(filter apikeys.Filter, p pagination.Request) (*pagination.Page[apikeys.ApiKeyDTO], error)
+	AuthenticateApiKey(ctx context.Context, base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error)
+	GenerateNewApiKey(ctx context.Context, name string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error)
+	RevokeApiKey(ctx context.Context, id int64) error
+	ListAPIKeys(ctx context.Context, filter apikeys.Filter, p pagination.Request) (*pagination.Page[apikeys.ApiKeyDTO], error)
 	GetAPIKey(ctx context.Context, id int64) (*apikeys.HashedApiKey, error)
 }
diff --git a/services/tenants/transports/apikeys_http_test.go b/services/tenants/transports/apikeys_http_test.go
index fb3b41af..10eb05d6 100644
--- a/services/tenants/transports/apikeys_http_test.go
+++ b/services/tenants/transports/apikeys_http_test.go
@@ -1,6 +1,7 @@
 package tenantstransports_test
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -124,7 +125,7 @@ func TestNewApiKeyExpirationDateNotInTheFuture(t *testing.T) {
 func TestNewApiKeyTenantIsNotFound(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		GenerateNewApiKeyFunc: func(_ string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error) {
+		GenerateNewApiKeyFunc: func(ctx context.Context, _ string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error) {
 			assert.Equal(t, int64(905), tenantId)
 			assert.Equal(t, auth.Permissions{auth.Permission("WRITE_DEVICES")}, permissions)
 			assert.Nil(t, expiry)
@@ -148,7 +149,7 @@ func TestNewApiKeyTenantIsNotFound(t *testing.T) {
 func TestNewApiKeyErrorOccurs(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		GenerateNewApiKeyFunc: func(_ string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error) {
+		GenerateNewApiKeyFunc: func(ctx context.Context, _ string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error) {
 			assert.Equal(t, int64(905), tenantId)
 			assert.Equal(t, auth.Permissions{auth.Permission("WRITE_DEVICES")}, permissions)
 			assert.Nil(t, expiry)
@@ -173,7 +174,7 @@ func TestNewApiKeyIsCreatedWithExpirationDate(t *testing.T) {
 	// Arrange
 	exp := time.Now().UTC().Add(time.Hour * 24 * 5)
 	svc := ApiKeyServiceMock{
-		GenerateNewApiKeyFunc: func(_ string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error) {
+		GenerateNewApiKeyFunc: func(ctx context.Context, _ string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error) {
 			assert.Equal(t, int64(905), tenantId)
 			assert.Equal(t, auth.Permissions{auth.Permission("WRITE_DEVICES")}, permissions)
 			assert.NotNil(t, expiry)
@@ -198,7 +199,7 @@ func TestNewApiKeyIsCreatedWithExpirationDate(t *testing.T) {
 func TestNewApiKeyIsCreatedWithoutExpirationDate(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		GenerateNewApiKeyFunc: func(_ string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error) {
+		GenerateNewApiKeyFunc: func(ctx context.Context, _ string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error) {
 			assert.Equal(t, int64(905), tenantId)
 			assert.Equal(t, auth.Permissions{auth.Permission("WRITE_DEVICES")}, permissions)
 			assert.Nil(t, expiry)
@@ -238,7 +239,7 @@ func TestRevokeApiKeyInvalidApiKeyId(t *testing.T) {
 func TestRevokeApiKeyRevokesApiKey(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		RevokeApiKeyFunc: func(id int64) error {
+		RevokeApiKeyFunc: func(ctx context.Context, id int64) error {
 			assert.Equal(t, int64(123), id)
 			return nil
 		},
@@ -259,7 +260,7 @@ func TestRevokeApiKeyRevokesApiKey(t *testing.T) {
 func TestRevokeApiKeyRevokeFails(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		RevokeApiKeyFunc: func(id int64) error {
+		RevokeApiKeyFunc: func(ctx context.Context, id int64) error {
 			assert.Equal(t, int64(12343), id)
 			return fmt.Errorf("weird error")
 		},
@@ -280,7 +281,7 @@ func TestRevokeApiKeyRevokeFails(t *testing.T) {
 func TestRevokeApiKeyKeyDoesNotExist(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		RevokeApiKeyFunc: func(id int64) error {
+		RevokeApiKeyFunc: func(ctx context.Context, id int64) error {
 			assert.Equal(t, int64(12343), id)
 			return apikeys.ErrKeyNotFound
 		},
@@ -332,7 +333,7 @@ func TestAuthenticateAuthorizationHeaderIncorrectFormat(t *testing.T) {
 func TestAuthenticateErrorOccursWhileValidatingApiKey(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		AuthenticateApiKeyFunc: func(base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
+		AuthenticateApiKeyFunc: func(ctx context.Context, base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
 			assert.Equal(t, "MjMxNDMyNDM6bXl2YWxpZGFwaWtleQ==", base64IdAndKeyCombination)
 			return apikeys.ApiKeyAuthenticationDTO{}, fmt.Errorf("database error!")
 		},
@@ -354,7 +355,7 @@ func TestAuthenticateErrorOccursWhileValidatingApiKey(t *testing.T) {
 func TestAuthenticateApiKeyIsNotFound(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		AuthenticateApiKeyFunc: func(base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
+		AuthenticateApiKeyFunc: func(ctx context.Context, base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
 			assert.Equal(t, "MjMxNDMyNDM6bXl2YWxpZGFwaWtleQ==", base64IdAndKeyCombination)
 			return apikeys.ApiKeyAuthenticationDTO{}, apikeys.ErrKeyNotFound
 		},
@@ -376,7 +377,7 @@ func TestAuthenticateApiKeyIsNotFound(t *testing.T) {
 func TestAuthenticateApiKeyInvalidEncodingErrorOccurs(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		AuthenticateApiKeyFunc: func(base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
+		AuthenticateApiKeyFunc: func(ctx context.Context, base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
 			assert.Equal(t, "blablabla", base64IdAndKeyCombination)
 			return apikeys.ApiKeyAuthenticationDTO{}, apikeys.ErrInvalidEncoding
 		},
@@ -398,7 +399,7 @@ func TestAuthenticateApiKeyInvalidEncodingErrorOccurs(t *testing.T) {
 func TestAuthenticateApiKeyIsValidNoExpirationDate(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		AuthenticateApiKeyFunc: func(base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
+		AuthenticateApiKeyFunc: func(ctx context.Context, base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
 			assert.Equal(t, "MjMxNDMyNDM6bXl2YWxpZGFwaWtleQ==", base64IdAndKeyCombination)
 			return apikeys.ApiKeyAuthenticationDTO{
 				TenantID:    431,
@@ -424,7 +425,7 @@ func TestAuthenticateApiKeyIsValidNoExpirationDate(t *testing.T) {
 func TestAuthenticateApiKeyWithPermissions(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		AuthenticateApiKeyFunc: func(base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
+		AuthenticateApiKeyFunc: func(ctx context.Context, base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
 			assert.Equal(t, "MjMxNDMyNDM6bXl2YWxpZGFwaWtleQ==", base64IdAndKeyCombination)
 			return apikeys.ApiKeyAuthenticationDTO{
 				TenantID:    431,
@@ -451,7 +452,7 @@ func TestAuthenticateApiKeyIsValidWithExpirationDate(t *testing.T) {
 	// Arrange
 	exp := time.Now().Add(time.Minute).Unix()
 	svc := ApiKeyServiceMock{
-		AuthenticateApiKeyFunc: func(base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
+		AuthenticateApiKeyFunc: func(ctx context.Context, base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
 			assert.Equal(t, "MjMxNDMyNDM6bXl2YWxpZGFwaWtleQ==", base64IdAndKeyCombination)
 			return apikeys.ApiKeyAuthenticationDTO{
 				TenantID:    431,
@@ -477,7 +478,7 @@ func TestAuthenticateApiKeyIsValidWithExpirationDate(t *testing.T) {
 func TestListApiKeysReturnsPaginatedList(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		ListAPIKeysFunc: func(filter apikeys.Filter, p pagination.Request) (*pagination.Page[apikeys.ApiKeyDTO], error) {
+		ListAPIKeysFunc: func(ctx context.Context, filter apikeys.Filter, p pagination.Request) (*pagination.Page[apikeys.ApiKeyDTO], error) {
 			return &pagination.Page[apikeys.ApiKeyDTO]{
 				Cursor: "encoded_cursor",
 				Data: []apikeys.ApiKeyDTO{
@@ -526,7 +527,7 @@ func TestListApiKeysInvalidParams(t *testing.T) {
 func TestListApiKeysErrorsOccursWhileRetrievingData(t *testing.T) {
 	// Arrange
 	svc := ApiKeyServiceMock{
-		ListAPIKeysFunc: func(filter apikeys.Filter, p pagination.Request) (*pagination.Page[apikeys.ApiKeyDTO], error) {
+		ListAPIKeysFunc: func(ctx context.Context, filter apikeys.Filter, p pagination.Request) (*pagination.Page[apikeys.ApiKeyDTO], error) {
 			return nil, fmt.Errorf("weird database error!")
 		},
 	}
diff --git a/services/tenants/transports/mock_test.go b/services/tenants/transports/mock_test.go
index 292ad187..0c6bbff4 100644
--- a/services/tenants/transports/mock_test.go
+++ b/services/tenants/transports/mock_test.go
@@ -24,19 +24,19 @@ var _ tenantstransports.ApiKeyService = &ApiKeyServiceMock{}
 //
 //		// make and configure a mocked tenantstransports.ApiKeyService
 //		mockedApiKeyService := &ApiKeyServiceMock{
-//			AuthenticateApiKeyFunc: func(base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
+//			AuthenticateApiKeyFunc: func(ctx context.Context, base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
 //				panic("mock out the AuthenticateApiKey method")
 //			},
-//			GenerateNewApiKeyFunc: func(name string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error) {
+//			GenerateNewApiKeyFunc: func(ctx context.Context, name string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error) {
 //				panic("mock out the GenerateNewApiKey method")
 //			},
 //			GetAPIKeyFunc: func(ctx context.Context, id int64) (*apikeys.HashedApiKey, error) {
 //				panic("mock out the GetAPIKey method")
 //			},
-//			ListAPIKeysFunc: func(filter apikeys.Filter, p pagination.Request) (*pagination.Page[apikeys.ApiKeyDTO], error) {
+//			ListAPIKeysFunc: func(ctx context.Context, filter apikeys.Filter, p pagination.Request) (*pagination.Page[apikeys.ApiKeyDTO], error) {
 //				panic("mock out the ListAPIKeys method")
 //			},
-//			RevokeApiKeyFunc: func(id int64) error {
+//			RevokeApiKeyFunc: func(ctx context.Context, id int64) error {
 //				panic("mock out the RevokeApiKey method")
 //			},
 //		}
@@ -47,29 +47,33 @@ var _ tenantstransports.ApiKeyService = &ApiKeyServiceMock{}
 //	}
 type ApiKeyServiceMock struct {
 	// AuthenticateApiKeyFunc mocks the AuthenticateApiKey method.
-	AuthenticateApiKeyFunc func(base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error)
+	AuthenticateApiKeyFunc func(ctx context.Context, base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error)
 
 	// GenerateNewApiKeyFunc mocks the GenerateNewApiKey method.
-	GenerateNewApiKeyFunc func(name string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error)
+	GenerateNewApiKeyFunc func(ctx context.Context, name string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error)
 
 	// GetAPIKeyFunc mocks the GetAPIKey method.
 	GetAPIKeyFunc func(ctx context.Context, id int64) (*apikeys.HashedApiKey, error)
 
 	// ListAPIKeysFunc mocks the ListAPIKeys method.
-	ListAPIKeysFunc func(filter apikeys.Filter, p pagination.Request) (*pagination.Page[apikeys.ApiKeyDTO], error)
+	ListAPIKeysFunc func(ctx context.Context, filter apikeys.Filter, p pagination.Request) (*pagination.Page[apikeys.ApiKeyDTO], error)
 
 	// RevokeApiKeyFunc mocks the RevokeApiKey method.
-	RevokeApiKeyFunc func(id int64) error
+	RevokeApiKeyFunc func(ctx context.Context, id int64) error
 
 	// calls tracks calls to the methods.
 	calls struct {
 		// AuthenticateApiKey holds details about calls to the AuthenticateApiKey method.
 		AuthenticateApiKey []struct {
+			// Ctx is the ctx argument value.
+			Ctx context.Context
 			// Base64IdAndKeyCombination is the base64IdAndKeyCombination argument value.
 			Base64IdAndKeyCombination string
 		}
 		// GenerateNewApiKey holds details about calls to the GenerateNewApiKey method.
 		GenerateNewApiKey []struct {
+			// Ctx is the ctx argument value.
+			Ctx context.Context
 			// Name is the name argument value.
 			Name string
 			// TenantId is the tenantId argument value.
@@ -88,6 +92,8 @@ type ApiKeyServiceMock struct {
 		}
 		// ListAPIKeys holds details about calls to the ListAPIKeys method.
 		ListAPIKeys []struct {
+			// Ctx is the ctx argument value.
+			Ctx context.Context
 			// Filter is the filter argument value.
 			Filter apikeys.Filter
 			// P is the p argument value.
@@ -95,6 +101,8 @@ type ApiKeyServiceMock struct {
 		}
 		// RevokeApiKey holds details about calls to the RevokeApiKey method.
 		RevokeApiKey []struct {
+			// Ctx is the ctx argument value.
+			Ctx context.Context
 			// ID is the id argument value.
 			ID int64
 		}
@@ -107,19 +115,21 @@ type ApiKeyServiceMock struct {
 }
 
 // AuthenticateApiKey calls AuthenticateApiKeyFunc.
-func (mock *ApiKeyServiceMock) AuthenticateApiKey(base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
+func (mock *ApiKeyServiceMock) AuthenticateApiKey(ctx context.Context, base64IdAndKeyCombination string) (apikeys.ApiKeyAuthenticationDTO, error) {
 	if mock.AuthenticateApiKeyFunc == nil {
 		panic("ApiKeyServiceMock.AuthenticateApiKeyFunc: method is nil but ApiKeyService.AuthenticateApiKey was just called")
 	}
 	callInfo := struct {
+		Ctx                       context.Context
 		Base64IdAndKeyCombination string
 	}{
+		Ctx:                       ctx,
 		Base64IdAndKeyCombination: base64IdAndKeyCombination,
 	}
 	mock.lockAuthenticateApiKey.Lock()
 	mock.calls.AuthenticateApiKey = append(mock.calls.AuthenticateApiKey, callInfo)
 	mock.lockAuthenticateApiKey.Unlock()
-	return mock.AuthenticateApiKeyFunc(base64IdAndKeyCombination)
+	return mock.AuthenticateApiKeyFunc(ctx, base64IdAndKeyCombination)
 }
 
 // AuthenticateApiKeyCalls gets all the calls that were made to AuthenticateApiKey.
@@ -127,9 +137,11 @@ func (mock *ApiKeyServiceMock) AuthenticateApiKey(base64IdAndKeyCombination stri
 //
 //	len(mockedApiKeyService.AuthenticateApiKeyCalls())
 func (mock *ApiKeyServiceMock) AuthenticateApiKeyCalls() []struct {
+	Ctx                       context.Context
 	Base64IdAndKeyCombination string
 } {
 	var calls []struct {
+		Ctx                       context.Context
 		Base64IdAndKeyCombination string
 	}
 	mock.lockAuthenticateApiKey.RLock()
@@ -139,16 +151,18 @@ func (mock *ApiKeyServiceMock) AuthenticateApiKeyCalls() []struct {
 }
 
 // GenerateNewApiKey calls GenerateNewApiKeyFunc.
-func (mock *ApiKeyServiceMock) GenerateNewApiKey(name string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error) {
+func (mock *ApiKeyServiceMock) GenerateNewApiKey(ctx context.Context, name string, tenantId int64, permissions auth.Permissions, expiry *time.Time) (string, error) {
 	if mock.GenerateNewApiKeyFunc == nil {
 		panic("ApiKeyServiceMock.GenerateNewApiKeyFunc: method is nil but ApiKeyService.GenerateNewApiKey was just called")
 	}
 	callInfo := struct {
+		Ctx         context.Context
 		Name        string
 		TenantId    int64
 		Permissions auth.Permissions
 		Expiry      *time.Time
 	}{
+		Ctx:         ctx,
 		Name:        name,
 		TenantId:    tenantId,
 		Permissions: permissions,
@@ -157,7 +171,7 @@ func (mock *ApiKeyServiceMock) GenerateNewApiKey(name string, tenantId int64, pe
 	mock.lockGenerateNewApiKey.Lock()
 	mock.calls.GenerateNewApiKey = append(mock.calls.GenerateNewApiKey, callInfo)
 	mock.lockGenerateNewApiKey.Unlock()
-	return mock.GenerateNewApiKeyFunc(name, tenantId, permissions, expiry)
+	return mock.GenerateNewApiKeyFunc(ctx, name, tenantId, permissions, expiry)
 }
 
 // GenerateNewApiKeyCalls gets all the calls that were made to GenerateNewApiKey.
@@ -165,12 +179,14 @@ func (mock *ApiKeyServiceMock) GenerateNewApiKey(name string, tenantId int64, pe
 //
 //	len(mockedApiKeyService.GenerateNewApiKeyCalls())
 func (mock *ApiKeyServiceMock) GenerateNewApiKeyCalls() []struct {
+	Ctx         context.Context
 	Name        string
 	TenantId    int64
 	Permissions auth.Permissions
 	Expiry      *time.Time
 } {
 	var calls []struct {
+		Ctx         context.Context
 		Name        string
 		TenantId    int64
 		Permissions auth.Permissions
@@ -219,21 +235,23 @@ func (mock *ApiKeyServiceMock) GetAPIKeyCalls() []struct {
 }
 
 // ListAPIKeys calls ListAPIKeysFunc.
-func (mock *ApiKeyServiceMock) ListAPIKeys(filter apikeys.Filter, p pagination.Request) (*pagination.Page[apikeys.ApiKeyDTO], error) {
+func (mock *ApiKeyServiceMock) ListAPIKeys(ctx context.Context, filter apikeys.Filter, p pagination.Request) (*pagination.Page[apikeys.ApiKeyDTO], error) {
 	if mock.ListAPIKeysFunc == nil {
 		panic("ApiKeyServiceMock.ListAPIKeysFunc: method is nil but ApiKeyService.ListAPIKeys was just called")
 	}
 	callInfo := struct {
+		Ctx    context.Context
 		Filter apikeys.Filter
 		P      pagination.Request
 	}{
+		Ctx:    ctx,
 		Filter: filter,
 		P:      p,
 	}
 	mock.lockListAPIKeys.Lock()
 	mock.calls.ListAPIKeys = append(mock.calls.ListAPIKeys, callInfo)
 	mock.lockListAPIKeys.Unlock()
-	return mock.ListAPIKeysFunc(filter, p)
+	return mock.ListAPIKeysFunc(ctx, filter, p)
 }
 
 // ListAPIKeysCalls gets all the calls that were made to ListAPIKeys.
@@ -241,10 +259,12 @@ func (mock *ApiKeyServiceMock) ListAPIKeys(filter apikeys.Filter, p pagination.R
 //
 //	len(mockedApiKeyService.ListAPIKeysCalls())
 func (mock *ApiKeyServiceMock) ListAPIKeysCalls() []struct {
+	Ctx    context.Context
 	Filter apikeys.Filter
 	P      pagination.Request
 } {
 	var calls []struct {
+		Ctx    context.Context
 		Filter apikeys.Filter
 		P      pagination.Request
 	}
@@ -255,19 +275,21 @@ func (mock *ApiKeyServiceMock) ListAPIKeysCalls() []struct {
 }
 
 // RevokeApiKey calls RevokeApiKeyFunc.
-func (mock *ApiKeyServiceMock) RevokeApiKey(id int64) error {
+func (mock *ApiKeyServiceMock) RevokeApiKey(ctx context.Context, id int64) error {
 	if mock.RevokeApiKeyFunc == nil {
 		panic("ApiKeyServiceMock.RevokeApiKeyFunc: method is nil but ApiKeyService.RevokeApiKey was just called")
 	}
 	callInfo := struct {
-		ID int64
+		Ctx context.Context
+		ID  int64
 	}{
-		ID: id,
+		Ctx: ctx,
+		ID:  id,
 	}
 	mock.lockRevokeApiKey.Lock()
 	mock.calls.RevokeApiKey = append(mock.calls.RevokeApiKey, callInfo)
 	mock.lockRevokeApiKey.Unlock()
-	return mock.RevokeApiKeyFunc(id)
+	return mock.RevokeApiKeyFunc(ctx, id)
 }
 
 // RevokeApiKeyCalls gets all the calls that were made to RevokeApiKey.
@@ -275,10 +297,12 @@ func (mock *ApiKeyServiceMock) RevokeApiKey(id int64) error {
 //
 //	len(mockedApiKeyService.RevokeApiKeyCalls())
 func (mock *ApiKeyServiceMock) RevokeApiKeyCalls() []struct {
-	ID int64
+	Ctx context.Context
+	ID  int64
 } {
 	var calls []struct {
-		ID int64
+		Ctx context.Context
+		ID  int64
 	}
 	mock.lockRevokeApiKey.RLock()
 	calls = mock.calls.RevokeApiKey
diff --git a/services/tenants/transports/webui/routes/api-keys.go b/services/tenants/transports/webui/routes/api-keys.go
index dc6092d2..dda8d8e5 100644
--- a/services/tenants/transports/webui/routes/api-keys.go
+++ b/services/tenants/transports/webui/routes/api-keys.go
@@ -1,7 +1,6 @@
 package routes
 
 import (
-	"context"
 	"fmt"
 	"log"
 	"net/http"
@@ -14,7 +13,7 @@ import (
 	"github.com/samber/lo"
 
 	"sensorbucket.nl/sensorbucket/internal/flash_messages"
-	"sensorbucket.nl/sensorbucket/pkg/api"
+	"sensorbucket.nl/sensorbucket/internal/pagination"
 	"sensorbucket.nl/sensorbucket/pkg/auth"
 	"sensorbucket.nl/sensorbucket/pkg/layout"
 	"sensorbucket.nl/sensorbucket/services/tenants/apikeys"
@@ -24,15 +23,13 @@ import (
 
 type APIKeysPageHandler struct {
 	router  chi.Router
-	client  *api.APIClient
 	apiKeys *apikeys.Service
 	tenants *tenants.TenantService
 }
 
-func SetupAPIKeyRoutes(client *api.APIClient, apiKeys *apikeys.Service, tenants *tenants.TenantService) *APIKeysPageHandler {
+func SetupAPIKeyRoutes(apiKeys *apikeys.Service, tenants *tenants.TenantService) *APIKeysPageHandler {
 	handler := &APIKeysPageHandler{
 		router:  chi.NewRouter(),
-		client:  client,
 		apiKeys: apiKeys,
 		tenants: tenants,
 	}
@@ -56,21 +53,26 @@ func (h APIKeysPageHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 func (h *APIKeysPageHandler) apiKeysGetTableRows() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		req := h.client.APIKeysApi.ListApiKeys(r.Context())
-		if r.URL.Query().Has("cursor") {
-			req = req.Cursor(r.URL.Query().Get("cursor"))
-		} else {
-			// If no cursor is given, the initial state must be derived from the url params
-			req = req.Limit(15)
-			tenantId := r.URL.Query().Get("tenant_id")
-			id, err := strconv.ParseInt(tenantId, 10, 64)
+		var tenantIDS []int64
+		query := r.URL.Query()
+		for _, tenantIDString := range query["tenant_id"] {
+			tenantID, err := strconv.ParseInt(tenantIDString, 10, 64)
 			if err != nil {
 				flash_messages.WriteErrorFlashMessage(w, r, "tenant_id must be a valid number")
 				return
 			}
-			req = req.TenantId(id)
+			tenantIDS = append(tenantIDS, tenantID)
 		}
-		res, _, err := req.Execute()
+		apiKeyPage, err := h.apiKeys.ListAPIKeys(
+			r.Context(),
+			apikeys.Filter{
+				TenantID: tenantIDS,
+			},
+			pagination.Request{
+				Cursor: r.URL.Query().Get("cursor"),
+				Limit:  15,
+			},
+		)
 		if err != nil {
 			if apiErr, ok := flash_messages.IsAPIError(err); ok && apiErr.Message != nil {
 				log.Printf("list api key for table result api unexpected status code: %s\n", err)
@@ -83,15 +85,15 @@ func (h *APIKeysPageHandler) apiKeysGetTableRows() http.HandlerFunc {
 		}
 
 		nextPage := ""
-		if res.Links.GetNext() != "" {
-			nextPage = views.U("/api-keys/table?cursor=" + getCursor(res.Links.GetNext()))
+		if apiKeyPage.Cursor != "" {
+			nextPage = views.U("/api-keys/table?cursor=" + apiKeyPage.Cursor)
 		}
 
 		viewKeys := []views.APIKey{}
-		for _, key := range res.Data {
+		for _, key := range apiKeyPage.Data {
 			viewKeys = append(viewKeys, views.APIKey{
-				ID:             int(key.Id),
-				TenantID:       int(key.TenantId),
+				ID:             int(key.ID),
+				TenantID:       int(key.TenantID),
 				Created:        key.Created,
 				ExpirationDate: key.ExpirationDate,
 				Name:           key.Name,
@@ -121,7 +123,13 @@ func (h *APIKeysPageHandler) apiKeysListPage() http.HandlerFunc {
 		}()
 
 		// The initial page starts with an overview of different tenants
-		list, resp, err := h.client.TenantsApi.ListTenants(r.Context()).State(1).Execute()
+		tenantPage, err := h.tenants.ListTenants(
+			r.Context(),
+			tenants.Filter{
+				State: []tenants.State{1},
+			},
+			pagination.Request{},
+		)
 		if err != nil {
 			if apiErr, ok := flash_messages.IsAPIError(err); ok && apiErr.Message != nil {
 				log.Printf("list api key result api unexpected status code: %s\n", err)
@@ -132,15 +140,9 @@ func (h *APIKeysPageHandler) apiKeysListPage() http.HandlerFunc {
 			}
 			return
 		}
-		if resp.StatusCode != http.StatusOK {
-			log.Printf("api key api returned unexpected status code\n")
-			flash_messages.AddErrorFlashMessageToPage(r, &page.FlashMessagesContainer, "An unexpected error occurred in the API")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
 
 		// Convert the tenants so they can be displayed in the view
-		page.Tenants = toViewTenants(list.Data)
+		page.Tenants = toViewTenants(tenantPage.Data)
 	}
 }
 
@@ -185,7 +187,8 @@ func (h *APIKeysPageHandler) revokeAPIKey() http.HandlerFunc {
 			})
 			return
 		}
-		_, resp, err := h.client.APIKeysApi.RevokeApiKey(context.Background(), apiKeyID).Execute()
+
+		err = h.apiKeys.RevokeApiKey(r.Context(), apiKeyID)
 		if err != nil {
 			if apiErr, ok := flash_messages.IsAPIError(err); ok && apiErr.Message != nil {
 				log.Printf("revoke api key result api unexpected status code: %s\n", err)
@@ -198,14 +201,6 @@ func (h *APIKeysPageHandler) revokeAPIKey() http.HandlerFunc {
 			http.Redirect(w, r, views.U("/api-keys"), http.StatusSeeOther)
 			return
 		}
-		if resp.StatusCode != http.StatusOK {
-			log.Printf("revoke api key result unexpected status code: %d\n", resp.StatusCode)
-			flash_messages.WriteErrorFlashMessage(w, r, "An unexpected error occurred")
-			w.WriteHeader(resp.StatusCode)
-			w.Header().Set("HX-Redirect", "/tenants/api-keys")
-			http.Redirect(w, r, views.U("/api-keys"), http.StatusSeeOther)
-			return
-		}
 
 		// Success, set the flash message and redirect
 		w.Header().Set("HX-Redirect", "/tenants/api-keys")
@@ -222,10 +217,10 @@ func (h *APIKeysPageHandler) createAPIKey() http.HandlerFunc {
 			return
 		}
 		name := r.FormValue("api-key-name")
-		expiry := r.FormValue("api-key-expiry")
+		expiryString := r.FormValue("api-key-expiry")
 		tenantId := r.FormValue("api-key-tenant")
-		permissions, ok := r.Form["api-key-permissions"]
-		if name == "" || tenantId == "" || !ok || len(permissions) == 0 {
+		permissionStrings, ok := r.Form["api-key-permissions"]
+		if name == "" || tenantId == "" || !ok || len(permissionStrings) == 0 {
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
@@ -235,22 +230,26 @@ func (h *APIKeysPageHandler) createAPIKey() http.HandlerFunc {
 			return
 		}
 
-		var dto api.CreateApiKeyRequest
-		dto.SetName(name)
-		dto.SetTenantId(id)
-		dto.SetPermissions(permissions)
-
 		// Expiry is an optional value
-		if expiry != "" {
-			parsedTime, err := time.Parse("2006-01-02", expiry)
+		var expiry *time.Time
+		if expiryString != "" {
+			parsedTime, err := time.Parse("2006-01-02", expiryString)
 			if err != nil {
 				w.WriteHeader(http.StatusBadRequest)
 				return
 			}
-			dto.SetExpirationDate(parsedTime)
+			expiry = &parsedTime
 		}
 
-		apiKey, resp, err := h.client.APIKeysApi.CreateApiKey(r.Context()).CreateApiKeyRequest(dto).Execute()
+		// Validate permissions
+		permissions, err := auth.StringsToPermissions(permissionStrings)
+		if err != nil {
+			log.Printf("create api key, invalid permission: %s\n", err)
+			flash_messages.AddErrorFlashMessage(w, r, err.Error())
+			return
+		}
+
+		apiKey, err := h.apiKeys.GenerateNewApiKey(r.Context(), name, id, permissions, expiry)
 		if err != nil {
 			if apiErr, ok := flash_messages.IsAPIError(err); ok && apiErr.Message != nil {
 				log.Printf("create api key result api unexpected status code: %s\n", err)
@@ -262,17 +261,11 @@ func (h *APIKeysPageHandler) createAPIKey() http.HandlerFunc {
 			http.Redirect(w, r, "/tenants/api-keys", http.StatusSeeOther)
 			return
 		}
-		if resp.StatusCode != http.StatusCreated {
-			log.Printf("revoke api key result unexpected status code: %d\n", resp.StatusCode)
-			flash_messages.AddErrorFlashMessage(w, r, "An unexpected error occurred")
-			http.Redirect(w, r, "/tenants/api-keys", http.StatusSeeOther)
-			return
-		}
 
 		// Add the API key as a flash message
 		flash_messages.AddWarningFlashMessage(w, r,
 			"This is your API key. Please copy your API key immediately as it will not be shown again.",
-			apiKey.ApiKey,
+			apiKey,
 			true)
 
 		// Redirect to overview page so that it may be shown
@@ -283,9 +276,7 @@ func (h *APIKeysPageHandler) createAPIKey() http.HandlerFunc {
 func (h *APIKeysPageHandler) createAPIKeyView() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		// Retrieve the tenants for the select box in the create view
-		req := h.client.TenantsApi.ListTenants(r.Context())
-		req = req.State(1) // State Active
-		list, resp, err := req.Execute()
+		tenantsPage, err := h.tenants.ListTenants(r.Context(), tenants.Filter{State: []tenants.State{tenants.Active}}, pagination.Request{})
 		if err != nil {
 			if apiErr, ok := flash_messages.IsAPIError(err); ok && apiErr.Message != nil {
 				log.Printf("list api key result for create view api unexpected status code: %s\n", err)
@@ -297,12 +288,7 @@ func (h *APIKeysPageHandler) createAPIKeyView() http.HandlerFunc {
 			http.Redirect(w, r, "/tenants/api-keys", http.StatusSeeOther)
 			return
 		}
-		if resp.StatusCode != http.StatusOK {
-			log.Printf("api key list failed : %d\n", resp.StatusCode)
-			flash_messages.AddErrorFlashMessage(w, r, "An unexpected error occurred in the API")
-			http.Redirect(w, r, "/tenants/api-keys", http.StatusSeeOther)
-			return
-		}
+
 		perms, err := toViewPermissions()
 		if err != nil {
 			log.Printf("error creating api key view, converting to view permissions: %s\n", err)
@@ -313,7 +299,7 @@ func (h *APIKeysPageHandler) createAPIKeyView() http.HandlerFunc {
 			Base: views.Base{
 				CSRFToken: nosurf.Token(r),
 			},
-			Tenants:     toViewTenants(list.Data),
+			Tenants:     toViewTenants(tenantsPage.Data),
 			Permissions: perms,
 		}
 		if layout.IsHX(r) {
@@ -423,11 +409,11 @@ func createAPIKeyViewPermissions() map[views.OrderedMapKey][]views.APIKeysPermis
 	}
 }
 
-func toViewTenants(tenants []api.Tenant) []views.TenantInfo {
+func toViewTenants(tenants []tenants.CreateTenantDTO) []views.TenantInfo {
 	viewTenants := []views.TenantInfo{}
 	for _, tenant := range tenants {
 		viewTenants = append(viewTenants, views.TenantInfo{
-			ID:   int(tenant.Id),
+			ID:   int(tenant.ID),
 			Name: tenant.Name,
 		})
 	}
diff --git a/services/tenants/transports/webui/routes/switch-tenant.go b/services/tenants/transports/webui/routes/switch-tenant.go
index bacbc746..d815e37e 100644
--- a/services/tenants/transports/webui/routes/switch-tenant.go
+++ b/services/tenants/transports/webui/routes/switch-tenant.go
@@ -29,8 +29,8 @@ func SetupTenantSwitchingRoutes(tenantService *tenants.TenantService, userPrefer
 		userPreferences: userPreferences,
 	}
 
-	handler.router.With(flash_messages.ExtractFlashMessage).Get("/switch", handler.httpSwitchTenantPage())
-	handler.router.Post("/switch", handler.httpDoSwitchTenantPage())
+	handler.router.With(flash_messages.ExtractFlashMessage).Get("/", handler.httpSwitchTenantPage())
+	handler.router.Post("/", handler.httpDoSwitchTenantPage())
 
 	return handler
 }
diff --git a/services/tenants/transports/webui/static/style.css b/services/tenants/transports/webui/static/style.css
index 2e4e530f..0e02f51d 100644
--- a/services/tenants/transports/webui/static/style.css
+++ b/services/tenants/transports/webui/static/style.css
@@ -595,6 +595,11 @@ video {
   margin-right: auto;
 }
 
+.my-1 {
+  margin-top: 0.25rem;
+  margin-bottom: 0.25rem;
+}
+
 .my-4 {
   margin-top: 1rem;
   margin-bottom: 1rem;
@@ -640,6 +645,10 @@ video {
   margin-top: 0.25rem;
 }
 
+.mt-10 {
+  margin-top: 2.5rem;
+}
+
 .mt-12 {
   margin-top: 3rem;
 }
diff --git a/services/tenants/transports/webui/views/layout.qtpl b/services/tenants/transports/webui/views/layout.qtpl
index c33ef64e..3e3f4717 100644
--- a/services/tenants/transports/webui/views/layout.qtpl
+++ b/services/tenants/transports/webui/views/layout.qtpl
@@ -54,7 +54,7 @@
 {% func renderSidebar() %}
     <section class="flex flex-col border-r">
         <h1 class="p-6 text-lg text-center">Settings</h1>
-        <hr class="px-6 py-1">
+        <hr class="px-6 my-1">
         <ul class="flex flex-col">
             <li>
                 <a
@@ -72,6 +72,14 @@
                     href="{%s U("/switch") %}">Switch tenant</a>
             </li>
         </ul>
+        <hr class="px-6 my-1">
+        <ul class="flex flex-col">
+            <li>
+                <a
+                    class="block text-sm py-3 px-6 transition-colors duration-150 hover:bg-gray-50"
+                    href="{%s U("/auth/logout") %}">Logout</a>
+            </li>
+        </ul>
     </section>
 {% endfunc %}
 
diff --git a/services/tenants/transports/webui/views/layout.qtpl.go b/services/tenants/transports/webui/views/layout.qtpl.go
index 75d39fa5..d7257ae9 100644
--- a/services/tenants/transports/webui/views/layout.qtpl.go
+++ b/services/tenants/transports/webui/views/layout.qtpl.go
@@ -250,7 +250,7 @@ func streamrenderSidebar(qw422016 *qt422016.Writer) {
 	qw422016.N().S(`
     <section class="flex flex-col border-r">
         <h1 class="p-6 text-lg text-center">Settings</h1>
-        <hr class="px-6 py-1">
+        <hr class="px-6 my-1">
         <ul class="flex flex-col">
             <li>
                 <a
@@ -280,117 +280,129 @@ func streamrenderSidebar(qw422016 *qt422016.Writer) {
 	qw422016.N().S(`">Switch tenant</a>
             </li>
         </ul>
+        <hr class="px-6 my-1">
+        <ul class="flex flex-col">
+            <li>
+                <a
+                    class="block text-sm py-3 px-6 transition-colors duration-150 hover:bg-gray-50"
+                    href="`)
+//line transports/webui/views/layout.qtpl:80
+	qw422016.E().S(U("/auth/logout"))
+//line transports/webui/views/layout.qtpl:80
+	qw422016.N().S(`">Logout</a>
+            </li>
+        </ul>
     </section>
 `)
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 }
 
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 func writerenderSidebar(qq422016 qtio422016.Writer) {
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 	streamrenderSidebar(qw422016)
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 	qt422016.ReleaseWriter(qw422016)
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 }
 
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 func renderSidebar() string {
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 	qb422016 := qt422016.AcquireByteBuffer()
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 	writerenderSidebar(qb422016)
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 	qs422016 := string(qb422016.B)
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 	qt422016.ReleaseByteBuffer(qb422016)
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 	return qs422016
-//line transports/webui/views/layout.qtpl:76
+//line transports/webui/views/layout.qtpl:84
 }
 
-//line transports/webui/views/layout.qtpl:79
+//line transports/webui/views/layout.qtpl:87
 type Base struct {
 	CSRFToken string
 	flash_messages.FlashMessagesContainer
 }
 
-//line transports/webui/views/layout.qtpl:84
+//line transports/webui/views/layout.qtpl:92
 func (b *Base) streamrenderCSRFToken(qw422016 *qt422016.Writer) {
-//line transports/webui/views/layout.qtpl:84
+//line transports/webui/views/layout.qtpl:92
 	qw422016.N().S(`
     `)
-//line transports/webui/views/layout.qtpl:85
+//line transports/webui/views/layout.qtpl:93
 	streamrenderCSRFToken(qw422016, b.CSRFToken)
-//line transports/webui/views/layout.qtpl:85
+//line transports/webui/views/layout.qtpl:93
 	qw422016.N().S(`
 `)
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 }
 
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 func (b *Base) writerenderCSRFToken(qq422016 qtio422016.Writer) {
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 	b.streamrenderCSRFToken(qw422016)
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 	qt422016.ReleaseWriter(qw422016)
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 }
 
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 func (b *Base) renderCSRFToken() string {
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 	qb422016 := qt422016.AcquireByteBuffer()
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 	b.writerenderCSRFToken(qb422016)
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 	qs422016 := string(qb422016.B)
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 	qt422016.ReleaseByteBuffer(qb422016)
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 	return qs422016
-//line transports/webui/views/layout.qtpl:86
+//line transports/webui/views/layout.qtpl:94
 }
 
-//line transports/webui/views/layout.qtpl:88
+//line transports/webui/views/layout.qtpl:96
 func streamrenderCSRFToken(qw422016 *qt422016.Writer, token string) {
-//line transports/webui/views/layout.qtpl:88
+//line transports/webui/views/layout.qtpl:96
 	qw422016.N().S(`
     <input type="hidden" name="csrf_token" value="`)
-//line transports/webui/views/layout.qtpl:89
+//line transports/webui/views/layout.qtpl:97
 	qw422016.E().S(token)
-//line transports/webui/views/layout.qtpl:89
+//line transports/webui/views/layout.qtpl:97
 	qw422016.N().S(`">
 `)
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 }
 
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 func writerenderCSRFToken(qq422016 qtio422016.Writer, token string) {
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 	streamrenderCSRFToken(qw422016, token)
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 	qt422016.ReleaseWriter(qw422016)
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 }
 
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 func renderCSRFToken(token string) string {
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 	qb422016 := qt422016.AcquireByteBuffer()
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 	writerenderCSRFToken(qb422016, token)
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 	qs422016 := string(qb422016.B)
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 	qt422016.ReleaseByteBuffer(qb422016)
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 	return qs422016
-//line transports/webui/views/layout.qtpl:90
+//line transports/webui/views/layout.qtpl:98
 }
diff --git a/services/tenants/transports/webui/webui.go b/services/tenants/transports/webui/webui.go
index e2ca8dbd..b28624f4 100644
--- a/services/tenants/transports/webui/webui.go
+++ b/services/tenants/transports/webui/webui.go
@@ -1,7 +1,6 @@
 package webui
 
 import (
-	"context"
 	"embed"
 	"fmt"
 	"net/http"
@@ -10,7 +9,6 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 
-	"sensorbucket.nl/sensorbucket/pkg/api"
 	"sensorbucket.nl/sensorbucket/pkg/auth"
 	"sensorbucket.nl/sensorbucket/services/tenants/apikeys"
 	"sensorbucket.nl/sensorbucket/services/tenants/sessions"
@@ -25,8 +23,7 @@ type WebUI struct {
 
 func New(
 	baseURLString,
-	jwksURL,
-	sensorbucketAPIEndpoint string,
+	jwksURL string,
 	tenantsService *tenants.TenantService,
 	apiKeys *apikeys.Service,
 	userPreferences *sessions.UserPreferenceService,
@@ -41,39 +38,13 @@ func New(
 		baseURL, _ = url.Parse(baseURLString)
 		views.SetBase(baseURL)
 	}
-
-	sbURL, err := url.Parse(sensorbucketAPIEndpoint)
-	if err != nil {
-		return nil, fmt.Errorf("could not parse SB_API url: %w", err)
-	}
-	cfg := api.NewConfiguration()
-	cfg.Scheme = sbURL.Scheme
-	cfg.Host = sbURL.Host
-	client := api.NewAPIClient(cfg)
-
 	ui.router.Use(middleware.Logger)
 	jwks := auth.NewJWKSHttpClient(jwksURL)
-	ui.router.Use(auth.Authenticate(jwks))
-	// Middleware to pass on basic auth to the client api
-	// TODO: This also exists in dashboard/main.go, perhaps make it a package?
-	// Also this will become a JWT instead of basic auth!
-	ui.router.Use(func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			user, pass, ok := r.BasicAuth()
-			if ok {
-				r = r.WithContext(context.WithValue(
-					r.Context(), api.ContextBasicAuth, api.BasicAuth{
-						UserName: user,
-						Password: pass,
-					}))
-			}
-			next.ServeHTTP(w, r)
-		})
-	})
+	authMW := auth.Authenticate(jwks)
 	ui.router.Handle("/static/*", serveStatic())
 	ui.router.Mount("/auth", routes.SetupKratosRoutes())
-	ui.router.Mount("/api-keys", routes.SetupAPIKeyRoutes(client, apiKeys, tenantsService))
-	ui.router.Mount("/", routes.SetupTenantSwitchingRoutes(tenantsService, userPreferences))
+	ui.router.With(authMW).Mount("/api-keys", routes.SetupAPIKeyRoutes(apiKeys, tenantsService))
+	ui.router.With(authMW).Mount("/switch", routes.SetupTenantSwitchingRoutes(tenantsService, userPreferences))
 
 	return ui, nil
 }
diff --git a/tools/docker-compose/oathkeeper_config/rules.json b/tools/docker-compose/oathkeeper_config/rules.json
index 1fe5eaa0..a30923ae 100644
--- a/tools/docker-compose/oathkeeper_config/rules.json
+++ b/tools/docker-compose/oathkeeper_config/rules.json
@@ -2,7 +2,7 @@
     {
         "id": "passthrough-authentication",
         "match": {
-            "url": "http://<127.0.0.1|localhost>:3000/<\\.ory(/.+)?>",
+            "url": "http://<127.0.0.1|localhost>:3000/<(\\.ory|tenants/auth/settings|tenants/auth/login|tenants/auth/logout|tenants/static|dev)(/.+)?>",
             "methods": [
                 "GET","POST","PATCH","PUT","DELETE"
             ]
@@ -20,7 +20,7 @@
     {
         "id": "auth",
         "match": {
-            "url": "http://<127.0.0.1|localhost>:3000</tenants|/dashboard|/api><(/.*)?>",
+            "url": "http://<127.0.0.1|localhost>:3000/<tenants/auth|((tenants/switch|tenants/api-keys|dashboard|api)(/.*)?)>",
             "methods": [
                 "GET",
                 "POST",
@@ -35,9 +35,6 @@
             },
             {
                 "handler": "bearer_token"
-            },
-            {
-                "handler": "noop"
             }
         ],
         "authorizer": {
@@ -48,8 +45,7 @@
                 "handler": "hydrator"
             },
             {
-                "handler": "id_token",
-                "config": {}
+                "handler": "id_token"
             }
         ]
     },
@@ -66,12 +62,6 @@
             ]
         },
         "authenticators": [
-            {
-                "handler": "cookie_session"
-            },
-            {
-                "handler": "bearer_token"
-            },
             {
                 "handler": "noop"
             }
@@ -81,11 +71,7 @@
         },
         "mutators": [
             {
-                "handler": "hydrator"
-            },
-            {
-                "handler": "id_token",
-                "config": {}
+                "handler": "noop"
             }
         ]
     }
diff --git a/tools/oathkeeper/bundled_openapi.yaml b/tools/oathkeeper/bundled_openapi.yaml
new file mode 100644
index 00000000..bf8ab5e1
--- /dev/null
+++ b/tools/oathkeeper/bundled_openapi.yaml
@@ -0,0 +1,2527 @@
+openapi: 3.0.0
+info:
+  title: Sensorbucket API
+  version: 1.1-rc1
+  license:
+    name: EUPLv1.2
+    url: https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/2020-03/EUPL-1.2%20EN.txt
+  description: |
+    SensorBucket processes data from different sources and devices into a single standardized format. 
+    An applications connected to SensorBucket, can use all devices SensorBucket supports.
+
+    Missing a device or source? SensorBucket is designed to be scalable and extendable. Create your own worker
+    that receives data from an AMQP source, process said data and output in the expected worker output format.
+
+    Find out more at: https://developer.sensorbucket.nl/
+
+    Developed and designed by Provincie Zeeland and Pollex'
+  contact:
+    name: Tim van Osch
+    email: info@pollex.nl
+    url: https://sensorbucket.nl
+servers:
+  - description: Production
+    url: https://sensorbucket.nl/api
+security:
+  - CookieSession: []
+  - APIKey: []
+  - Noop: []
+tags:
+  - name: Devices
+  - name: Pipelines
+  - name: Measurements
+  - name: Uplink
+  - name: Tracing
+  - name: Tenants
+  - name: Workers
+  - name: APIKeys
+paths:
+  /devices:
+    get:
+      x-is-paginated: true
+      operationId: ListDevices
+      summary: List devices
+      description: |
+        Fetch a list of devices.
+
+        Devices can be filtered on three items: properties, distance from a location or a bounding box.
+         - Filtering on properties filters devices on whether their property attribute is a superset of the given JSON object value
+         - Distance from location filtering requires a latitude, longitude and distance (in meters). All devices within that range will be returned
+         - Bounding box requires a North,East,South and West point. All devices within that box will be returned.
+
+        The filters distance from location and bounding box are mutually exclusive. The location distance filter will take precedence.
+      tags:
+        - Devices
+      parameters:
+        - in: query
+          name: properties
+          description: Used to filter devices by its properties. This filters devices on whether their property contains the provided value. The value must be a JSON string and depending on your client should be URL Escaped
+          schema:
+            type: string
+            example: '{ "eui": "1122334455667788" }'
+        - in: query
+          name: north
+          description: Used to filter devices within a bounding box
+          schema:
+            type: number
+            format: double
+            example: 3.6175560329103202
+        - in: query
+          name: west
+          description: Used to filter devices within a bounding box
+          schema:
+            type: number
+            format: double
+            example: 51.518796779610035
+        - in: query
+          name: east
+          description: Used to filter devices within a bounding box
+          schema:
+            type: number
+            format: double
+            example: 51.47912508218688
+        - in: query
+          name: south
+          description: Used to filter devices within a bounding box
+          schema:
+            type: number
+            format: double
+            example: 3.655955445579366
+        - in: query
+          name: latitude
+          description: Used to filter devices within a distance from a point
+          schema:
+            type: number
+            format: double
+            example: 51.496227862014685
+        - in: query
+          name: longitude
+          description: Used to filter devices within a distance from a point
+          schema:
+            type: number
+            format: double
+            example: 3.615071953647924
+        - in: query
+          name: distance
+          description: |
+            Used to filter devices within a distance from a point. 
+            The distance is given in meters.
+          schema:
+            type: integer
+            example: 1000
+        - in: query
+          name: cursor
+          description: The cursor for the current page
+          schema:
+            type: string
+        - in: query
+          name: limit
+          description: |
+            The maximum amount of items per page. Not applicable if `cursor` parameter is given. System limits are in place.
+          schema:
+            type: integer
+        - name: id
+          description: |
+            Filter by Device IDs
+          in: query
+          style: form
+          explode: true
+          schema:
+            type: array
+            items:
+              type: integer
+              format: int64
+        - name: sensor_group
+          description: |
+            Filter by device group
+          in: query
+          style: form
+          explode: true
+          schema:
+            type: array
+            items:
+              type: integer
+              format: int64
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/paginatedResponse'
+                  - type: object
+                    properties:
+                      data:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/device'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+    post:
+      operationId: CreateDevice
+      summary: Create device
+      description: |
+        Create a new device.
+
+        Depending on the type of device and the network it is registered on. The device might need specific properties to be set.  
+        **For example:** A LoRaWAN device often requires a `dev_eui` property to be set. The system will match incoming traffic against that property.
+      tags:
+        - Devices
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/createDeviceRequest'
+      responses:
+        '201':
+          description: Created
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: created device
+                  data:
+                    $ref: '#/components/schemas/device'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+  /devices/{id}:
+    get:
+      operationId: GetDevice
+      summary: Get device
+      description: |
+        Get the device with the given identifier.
+
+        The returned device will also include the full model of the sensors attached to that device.
+      tags:
+        - Devices
+      parameters:
+        - name: id
+          description: The numeric ID of the device
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: Fetched device
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Fetched device
+                  data:
+                    $ref: '#/components/schemas/device'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+    patch:
+      operationId: UpdateDevice
+      summary: Update device properties
+      description: |
+        Update a some properties of the device with the given identifier.
+
+        The request body should contain one or more modifiable properties of the Device.
+      tags:
+        - Devices
+      parameters:
+        - name: id
+          description: The numeric ID of the device
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/updateDeviceRequest'
+      responses:
+        '200':
+          description: Updated device properties
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Updated device properties
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+  /devices/{device_id}/sensors:
+    get:
+      x-is-paginated: true
+      operationId: ListDeviceSensors
+      summary: List sensors device
+      description: |
+        List all sensors related to the device with the provided identifier
+      tags:
+        - Devices
+      parameters:
+        - name: device_id
+          description: The identifier of the device
+          in: path
+          required: true
+          schema:
+            type: integer
+        - in: query
+          name: cursor
+          description: The cursor for the current page
+          schema:
+            type: string
+        - in: query
+          name: limit
+          description: |
+            The maximum amount of items per page. Not applicable if `cursor` parameter is given. System limits are in place.
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Listed device sensors
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/paginatedResponse'
+                  - type: object
+                    properties:
+                      data:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/sensor'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+    post:
+      operationId: CreateDeviceSensor
+      summary: Create sensor for device
+      description: |
+        Create a new sensor for the device with the given identifier.
+
+        A device can not have sensors with either a duplicate `code` or duplicate `external_id` field.
+        As this would result in conflicts while matching incoming messages to devices and sensors.
+      tags:
+        - Devices
+      parameters:
+        - name: device_id
+          description: The identifier of the device
+          in: path
+          required: true
+          schema:
+            type: integer
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/createSensorRequest'
+      responses:
+        '201':
+          description: Created new sensor for device
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Created new sensor for device
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+  /device/{device_id}/sensors/{sensor_code}:
+    delete:
+      operationId: DeleteDeviceSensor
+      summary: Delete sensor
+      description: |
+        Delete a sensor from the system. 
+
+        Since a sensor can only be related to one and only one device at a time, the sensor will be deleted from the system completely
+      tags:
+        - Devices
+      parameters:
+        - name: device_id
+          description: The identifier of the device
+          in: path
+          required: true
+          schema:
+            type: integer
+        - name: sensor_code
+          description: The code of the sensor
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Deleted sensor from device
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Deleted sensor from device
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+  /sensors:
+    get:
+      x-is-paginated: true
+      operationId: ListSensors
+      summary: List sensors
+      description: |
+        List all sensors.
+      tags:
+        - Devices
+      parameters:
+        - in: query
+          name: cursor
+          description: The cursor for the current page
+          schema:
+            type: string
+        - in: query
+          name: limit
+          description: |
+            The maximum amount of items per page. Not applicable if `cursor` parameter is given. System limits are in place.
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Fetched sensors
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/paginatedResponse'
+                  - type: object
+                    properties:
+                      data:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/sensor'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+  /sensor-groups:
+    get:
+      x-is-paginated: true
+      operationId: ListSensorGroups
+      summary: List sensor groups
+      description: |
+        Fetch a list of sensor groups.
+      tags:
+        - Devices
+      parameters:
+        - in: query
+          name: cursor
+          description: The cursor for the current page
+          schema:
+            type: string
+        - in: query
+          name: limit
+          description: |
+            The maximum amount of items per page. Not applicable if `cursor` parameter is given. System limits are in place.
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/paginatedResponse'
+                  - type: object
+                    properties:
+                      data:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/sensorGroup'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+    post:
+      operationId: CreateSensorGroup
+      summary: Create sensor group
+      description: |
+        Create a new sensor group.
+      tags:
+        - Devices
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/createSensorGroupRequest'
+      responses:
+        '201':
+          description: Created
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: created sensor group
+                  data:
+                    $ref: '#/components/schemas/sensorGroup'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+  /sensor-groups/{id}:
+    get:
+      operationId: GetSensorGroup
+      summary: Get sensor group
+      description: |
+        Get the sensor group with the given identifier.
+      tags:
+        - Devices
+      parameters:
+        - name: id
+          description: The numeric ID of the sensor group
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: Fetched sensor group
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Fetched sensor group
+                  data:
+                    $ref: '#/components/schemas/sensorGroup'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+    patch:
+      operationId: UpdateSensorGroup
+      summary: Update sensor group
+      description: |
+        Update a some properties of the sensor group with the given identifier.
+
+        The request body should contain one or more modifiable properties of the sensor group.
+      tags:
+        - Devices
+      parameters:
+        - name: id
+          description: The numeric ID of the sensor group
+          in: path
+          required: true
+          schema:
+            type: integer
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/updateSensorGroupRequest'
+      responses:
+        '200':
+          description: Updated Sensor Group properties
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Updated Sensor Group properties
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+    delete:
+      operationId: DeleteSensorGroup
+      summary: Delete sensor group
+      description: |
+        Delete a sensor group
+      tags:
+        - Devices
+      parameters:
+        - name: id
+          description: The id of the sensor group
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Sensor group deleted
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: sensor group deleted
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+  /sensor-groups/{id}/sensors:
+    post:
+      operationId: AddSensorToSensorGroup
+      summary: Add sensor to a sensor group
+      description: |
+        Add a sensor by its ID to a sensor group by its ID
+      tags:
+        - Devices
+      parameters:
+        - name: id
+          description: The identifier of the Sensor Group
+          in: path
+          required: true
+          schema:
+            type: integer
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                sensor_id:
+                  type: integer
+                  example: 5
+                  description: id of the sensor to add
+      responses:
+        '201':
+          description: Added sensor to sensor group
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Added sensor to sensor group
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+  /sensor-groups/{id}/sensors/{sensor_id}:
+    delete:
+      operationId: DeleteSensorFromSensorGroup
+      summary: Delete sensor from sensor group
+      description: |
+        Delete a sensor from a sensor group
+      tags:
+        - Devices
+      parameters:
+        - name: id
+          description: The identifier of the sensor group
+          in: path
+          required: true
+          schema:
+            type: integer
+        - name: sensor_id
+          description: The id of the sensor
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Deleted sensor from sensor group
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Deleted sensor from sensor group
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+  /measurements:
+    get:
+      x-is-paginated: true
+      operationId: QueryMeasurements
+      summary: Query measurements
+      description: |
+        Query a list of measurements.
+
+        This endpoint is used to get all measurements that correspond with the given filters.
+
+        It is commonly required to get a single stream of measurements from a single sensor. This can be accomplished by 
+        finding the corresponding datastream ID and using that in the `datastream` filter. 
+
+        Most query parameters can be repeated to get an OR combination of filters. For example, providing the `datastream` 
+        parameter twice will return measurements for either datastreams.
+      tags:
+        - Measurements
+      parameters:
+        - in: query
+          name: start
+          required: true
+          schema:
+            type: string
+            format: date-time
+            example: '2022-01-01T00:00:00Z'
+        - in: query
+          name: end
+          required: true
+          schema:
+            type: string
+            format: date-time
+            example: '2022-12-31T23:59:59Z'
+        - in: query
+          name: device_id
+          required: false
+          schema:
+            type: string
+        - in: query
+          name: datastream
+          required: false
+          schema:
+            type: string
+        - in: query
+          name: sensor_code
+          required: false
+          schema:
+            type: string
+        - in: query
+          name: cursor
+          description: The cursor for the current page
+          schema:
+            type: string
+        - in: query
+          name: limit
+          description: |
+            The maximum amount of items per page. Not applicable if `cursor` parameter is given. System limits are in place.
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Fetched measurements
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/paginatedResponse'
+                  - type: object
+                    properties:
+                      data:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/measurement'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+  /datastreams:
+    get:
+      x-is-paginated: true
+      operationId: ListDatastreams
+      summary: List all datastreams
+      description: |
+        List all datastreams.
+
+        A sensor can produce one or more timeseries of measurements. Such a unique timeserie is called a datastream.  
+
+        **For example:** A Particulate Matter sensor might return count the number of particles smaller than 2.5 μg/cm2, 5 μg/cm2 and 10 μg/cm2.
+        this is one sensor producing three datastreams.
+
+        Another example would be a worker which processes raw incoming values into meaningful data.
+        An underwater pressure sensor might supply its measurement in milli Amperes, but the worker converts it to watercolumn in meters.
+        The sensor now has two datastreams. Presusre in millivolt and watercolumn in meters.
+      tags:
+        - Measurements
+      parameters:
+        - name: sensor
+          description: only return datastreams that are produced by the given sensor identifier
+          in: query
+          style: form
+          explode: true
+          schema:
+            type: array
+            items:
+              type: integer
+              format: int64
+        - in: query
+          name: cursor
+          description: The cursor for the current page
+          schema:
+            type: string
+        - in: query
+          name: limit
+          description: |
+            The maximum amount of items per page. Not applicable if `cursor` parameter is given. System limits are in place.
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: Fetched datastreams
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/paginatedResponse'
+                  - type: object
+                    properties:
+                      data:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/datastream'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+  /datastreams/{id}:
+    get:
+      operationId: GetDatastream
+      summary: Get datastream
+      description: |
+        Get the datastream with the given identifier.
+
+        The returned datastream will also include the full model of the sensors attached to that datastream.
+      tags:
+        - Measurements
+      parameters:
+        - name: id
+          description: The UUID of the datastream
+          in: path
+          required: true
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Fetched datastream
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Fetched datastream
+                  data:
+                    type: object
+                    properties:
+                      datastream:
+                        $ref: '#/components/schemas/datastream'
+                      device:
+                        $ref: '#/components/schemas/device'
+                      sensor:
+                        $ref: '#/components/schemas/sensor'
+                      latest_measurement_value:
+                        type: number
+                        format: double
+                      latest_measurement_timestamp:
+                        type: string
+                        format: date-time
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+  /pipelines:
+    get:
+      x-is-paginated: true
+      operationId: ListPipelines
+      summary: List pipelines
+      description: |
+        List pipelines. By default only `state=active` pipelines are returned.
+        By providing the query parameter `inactive` only the inactive pipelines will be returned.
+
+        Pipelines can be filtered by providing one or more `step`s. This query parameter can be repeated to include more steps.
+        When multiple steps are given, pipelines containing one of the given steps will be returned.
+      tags:
+        - Pipelines
+      parameters:
+        - name: inactive
+          description: Only show inactive pipelines
+          in: query
+          required: false
+          schema:
+            type: boolean
+        - name: step
+          description: Only show pipelines that include at least one of these steps
+          in: query
+          required: false
+          style: form
+          explode: true
+          schema:
+            type: array
+            items:
+              type: string
+          example:
+            - thethingsnetwork
+            - multiflexmeter
+        - in: query
+          name: cursor
+          description: The cursor for the current page
+          schema:
+            type: string
+        - in: query
+          name: limit
+          description: |
+            The maximum amount of items per page. Not applicable if `cursor` parameter is given. System limits are in place.
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Fetched pipelines
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/paginatedResponse'
+                  - type: object
+                    properties:
+                      data:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/pipeline'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+    post:
+      operationId: CreatePipeline
+      summary: Create pipeline
+      description: |
+        Create a new pipeline. 
+
+        A pipeline determines which workers, in which order the incoming data will be processed by.
+
+        A pipeline step is used as routing key in the Message Queue. This might be changed in future releases.
+
+        **Note:** currently there are no validations in place on whether a worker for the provided step actually exists.
+      tags:
+        - Pipelines
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/createPipelineRequest'
+      responses:
+        '200':
+          description: Created pipeline
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Created pipeline
+                  data:
+                    $ref: '#/components/schemas/pipeline'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+  /pipelines/{id}:
+    get:
+      operationId: GetPipeline
+      summary: Get pipeline
+      description: |
+        Get the pipeline with the given identifier.
+
+        This endpoint by default returns a 404 Not Found for inactive pipelines.
+        To get an inactive pipeline, provide the `status=inactive` query parameter.
+      tags:
+        - Pipelines
+      parameters:
+        - name: id
+          description: The UUID of the pipeline
+          in: path
+          required: true
+          schema:
+            type: string
+            format: uuid
+        - name: status
+          description: |
+            The status of the pipeline. Use `inactive` to view inactive pipelines instead of getting a 404 error
+          in: query
+          example:
+            - active
+            - inactive
+          style: form
+          explode: true
+          schema:
+            type: array
+            items:
+              type: string
+      responses:
+        '200':
+          description: Fetched pipeline
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Fetched pipeline
+                  data:
+                    $ref: '#/components/schemas/pipeline'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          description: |
+            The request failed because the requested resource could not be found or because the resource is disabled
+    patch:
+      operationId: UpdatePipeline
+      summary: Update pipeline
+      description: |
+        Update some properties of the pipeline with the given identifier. 
+
+        Setting an invalid state or making an invalid state transition will result in an error.
+      tags:
+        - Pipelines
+      parameters:
+        - name: id
+          description: The UUID of the pipeline
+          in: path
+          required: true
+          schema:
+            type: string
+            format: uuid
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/updatePipelineRequest'
+      responses:
+        '200':
+          description: Updated pipeline
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Updated pipeline
+                  data:
+                    $ref: '#/components/schemas/pipeline'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          description: |
+            The request failed because the requested resource could not be found or because the resource is disabled
+        '405':
+          description: |
+            The request failed because the request is invalid.
+    delete:
+      operationId: DisablePipeline
+      summary: Disable pipeline
+      description: |
+        Disables a pipeline by setting its status to inactive.
+
+        Inactive pipelines will - by default - not appear in the `ListPipelines` and `GetPipeline` endpoints,
+        unless the `status=inactive` query parameter is given on that endpoint.
+      tags:
+        - Pipelines
+      parameters:
+        - name: id
+          description: The UUID of the pipeline
+          in: path
+          required: true
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: pipeline disabled
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Disabled pipeline
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          description: |
+            The request failed because the requested resource could not be found or because the resource is disabled
+        '405':
+          description: |
+            The request failed because the request is invalid.
+  /uplinks/{pipeline_id}:
+    post:
+      tags:
+        - Uplink
+      operationId: processUplinkData
+      summary: Process uplink message
+      description: |
+        Push an uplink message to the HTTP Importer for processing.
+
+        The request body and content-type can be anything the workers (defined by the pipeline steps) in the pipeline expect.
+
+        As this process is asynchronuous, any processing error will not be returned in the response.
+        Only if the HTTP Importer is unable to push the message to the Message Queue, will an error be returned. 
+      parameters:
+        - name: pipeline_id
+          description: The UUID of the pipeline
+          in: path
+          required: true
+          example: c4d4fabd-9109-40cd-88b0-be40ca1745f7
+          schema:
+            type: string
+            format: uuid
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+      responses:
+        '201':
+          description: Accepted uplink
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          description: The request failed because the requested resource could not be found or is disabled.
+  /tracing:
+    get:
+      x-is-paginated: true
+      operationId: ListTraces
+      summary: List traces
+      description: |
+        Lists traces that match the provided filter.
+      tags:
+        - Tracing
+      parameters:
+        - in: query
+          name: cursor
+          description: The cursor for the current page
+          schema:
+            type: string
+        - in: query
+          name: limit
+          description: |
+            The maximum amount of items per page. Not applicable if `cursor` parameter is given. System limits are in place.
+          schema:
+            type: integer
+        - in: query
+          name: tracing_id
+          style: form
+          explode: true
+          schema:
+            type: array
+            items:
+              type: string
+              format: uuid
+              example: a59d28c8-2a0f-4e89-9f49-6942f1c04342
+        - in: query
+          name: device_id
+          schema:
+            type: integer
+            format: int64
+            example: 5
+        - in: query
+          name: status
+          schema:
+            type: integer
+            example: 2
+        - in: query
+          name: duration_greater_than
+          schema:
+            type: integer
+            example: 5
+        - in: query
+          name: duration_smaller_than
+          schema:
+            type: integer
+            example: 10
+      responses:
+        '200':
+          description: Fetched traces
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/paginatedResponse'
+                  - type: object
+                    properties:
+                      data:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/trace'
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+  /ingresses:
+    get:
+      x-is-paginated: true
+      operationId: ListIngresses
+      summary: List ingresses
+      description: |
+        Lists ingresses that match the provided filter.
+      tags:
+        - Tracing
+      parameters:
+        - in: query
+          name: cursor
+          description: The cursor for the current page
+          schema:
+            type: string
+        - in: query
+          name: limit
+          description: |
+            The maximum amount of items per page. Not applicable if `cursor` parameter is given. System limits are in place.
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Fetched ingresses
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/paginatedResponse'
+                  - type: object
+                    properties:
+                      data:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/archivedIngress'
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+  /workers:
+    get:
+      x-is-paginated: true
+      operationId: ListWorkers
+      summary: List workers
+      description: |
+        Lists traces that match the provided filter.
+      tags:
+        - Workers
+      parameters:
+        - in: query
+          name: cursor
+          description: The cursor for the current page
+          schema:
+            type: string
+        - in: query
+          name: limit
+          description: |
+            The maximum amount of items per page. Not applicable if `cursor` parameter is given. System limits are in place.
+          schema:
+            type: integer
+        - name: id
+          description: |
+            Filter by Pipeline IDs
+          in: query
+          style: form
+          explode: true
+          schema:
+            type: array
+            items:
+              type: string
+      responses:
+        '200':
+          description: Fetched workers
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/paginatedResponse'
+                  - type: object
+                    properties:
+                      data:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/userWorker'
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+    post:
+      operationId: CreateWorker
+      summary: Create Worker
+      description: |
+        Create a new worker
+      tags:
+        - Workers
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/createUserWorkerRequest'
+      responses:
+        '201':
+          description: Created worker
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: created user worker
+                  data:
+                    $ref: '#/components/schemas/userWorker'
+  /workers/{id}:
+    get:
+      operationId: GetWorker
+      summary: Get worker
+      description: |
+        Get the worker with the given identifier.
+      tags:
+        - Workers
+      parameters:
+        - name: id
+          description: The UUID of the worker
+          in: path
+          required: true
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Fetched worker
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Fetched worker
+                  data:
+                    $ref: '#/components/schemas/userWorker'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+    patch:
+      operationId: UpdateWorker
+      summary: Update worker properties
+      description: |
+        Update a some properties of the worker with the given identifier.
+
+        The request body should contain one or more modifiable properties of the Worker.
+      tags:
+        - Workers
+      parameters:
+        - name: id
+          description: The UUID of the worker
+          in: path
+          required: true
+          schema:
+            type: string
+            format: uuid
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/updateWorkerRequest'
+      responses:
+        '200':
+          description: Updated worker properties
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Updated worker properties
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+  /workers/{id}/usercode:
+    get:
+      operationId: GetWorkerUserCode
+      summary: Get the User Code for a Worker
+      description: |
+        Get the worker with the given identifier.
+      tags:
+        - Workers
+      parameters:
+        - name: id
+          description: The UUID of the worker
+          in: path
+          required: true
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Fetched worker user code
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Fetched worker
+                  data:
+                    type: string
+                    format: base64
+                    description: The usercode base64 encoded
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+  /tenants:
+    get:
+      x-is-paginated: true
+      operationId: ListTenants
+      summary: Retrieves tenants
+      description: |
+        Lists Tenants
+      tags:
+        - Tenants
+      parameters:
+        - in: query
+          name: name
+          description: Filter on specific name of a tenant
+          schema:
+            type: integer
+            format: int64
+        - in: query
+          name: state
+          description: Filter on soecific state of a tenant
+          schema:
+            type: integer
+            format: int64
+            example: 1
+        - in: query
+          name: is_member
+          description: Only show tenants that this user is a member of
+          schema:
+            type: boolean
+        - in: query
+          name: cursor
+          description: The cursor for the current page
+          schema:
+            type: string
+        - in: query
+          name: limit
+          description: |
+            The maximum amount of items per page. Not applicable if `cursor` parameter is given. System limits are in place.
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Fetched Tenants
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/paginatedResponse'
+                  - type: object
+                    properties:
+                      data:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/tenant'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+  /tenants/{tenant_id}/members:
+    post:
+      operationId: AddTenantMember
+      summary: Add a User to a Tenant as member
+      description: |
+        Adds a user with the specific ID to the given Tenant as a member with the given permissions
+      tags:
+        - Tenants
+      parameters:
+        - name: tenant_id
+          description: The identifier of the tenant
+          in: path
+          required: true
+          schema:
+            type: integer
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/addTenantMemberRequest'
+      responses:
+        '201':
+          description: User added to Tenant
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: User added to Tenant
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '404':
+          $ref: '#/components/responses/404'
+  /tenants/{tenant_id}/members/{user_id}:
+    delete:
+      tags:
+        - Tenants
+      operationId: RemoveTenantMember
+      summary: Removes a member from a tenant
+      description: |
+        Removes a member by the given user id from a tenant
+      parameters:
+        - name: tenant_id
+          description: The identifier of the tenant
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+        - name: user_id
+          description: The identifier of the user
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Member removed from tenant
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '500':
+          $ref: '#/components/responses/500'
+    patch:
+      tags:
+        - Tenants
+      operationId: UpdateTenantMember
+      summary: Update a tenant member's permissions
+      description: |
+        Update a tenant member's permissions
+      parameters:
+        - name: tenant_id
+          description: The identifier of the tenant
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+        - name: user_id
+          description: The identifier of the user
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/updateTenantMemberRequest'
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: Member removed from tenant
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '500':
+          $ref: '#/components/responses/500'
+  /api-keys:
+    get:
+      x-is-paginated: true
+      operationId: ListApiKeys
+      summary: List API Keys
+      description: |
+        Lists API Keys
+      tags:
+        - APIKeys
+      parameters:
+        - in: query
+          name: tenant_id
+          description: The id of the tenant from which to retrieve API keys
+          schema:
+            type: integer
+            format: int64
+        - in: query
+          name: cursor
+          description: The cursor for the current page
+          schema:
+            type: string
+        - in: query
+          name: limit
+          description: |
+            The maximum amount of items per page. Not applicable if `cursor` parameter is given. System limits are in place.
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Fetched API keys
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/paginatedResponse'
+                  - type: object
+                    properties:
+                      data:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/apiKey'
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '500':
+          $ref: '#/components/responses/500'
+    post:
+      tags:
+        - APIKeys
+      operationId: CreateApiKey
+      summary: Creates a new API key for the given Tenant
+      description: |
+        Create an API key for a tenant with an expiration date. Permissions for the API key within that organisation must be set
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/createApiKeyRequest'
+      responses:
+        '201':
+          description: Created API key
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/apiKeyCreated'
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '500':
+          $ref: '#/components/responses/500'
+  /api-keys/{api_key_id}:
+    get:
+      operationId: GetAPIKey
+      summary: Get an API Key by ID
+      description: |
+        Get an API Key by ID
+      parameters:
+        - name: api_key_id
+          description: The identifier of the API key
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+      tags:
+        - APIKeys
+      responses:
+        '200':
+          description: Fetched API key
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/apiKey'
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '500':
+          $ref: '#/components/responses/500'
+    delete:
+      tags:
+        - APIKeys
+      operationId: RevokeApiKey
+      summary: Revokes an API key
+      description: |
+        Revokes an API key so that it can't be used anymore
+      parameters:
+        - name: api_key_id
+          description: The identifier of the API key
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: The request failed because of an unexpected server error
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    example: API key has been revoked
+        '400':
+          $ref: '#/components/responses/400'
+        '401':
+          $ref: '#/components/responses/401'
+        '403':
+          $ref: '#/components/responses/403'
+        '500':
+          $ref: '#/components/responses/500'
+components:
+  securitySchemes:
+    CookieSession:
+      description: |
+        When a user is logged in a session cookie will be set which authenticates the user.
+      type: apiKey
+      in: cookie
+      name: SID
+    APIKey:
+      description: |
+        An API Key given through the Authorization header will authenticate an organisation
+      type: http
+      scheme: Bearer
+    Noop:
+      description: |
+        Bypasses all authentication
+  schemas:
+    paginatedResponse:
+      type: object
+      required:
+        - links
+        - page_size
+        - total_count
+        - data
+      properties:
+        links:
+          type: object
+          properties:
+            previous:
+              type: string
+            next:
+              type: string
+        page_size:
+          type: integer
+        total_count:
+          type: integer
+        data:
+          type: array
+          items: {}
+    sensor:
+      type: object
+      required:
+        - id
+        - code
+        - description
+        - external_id
+        - brand
+        - properties
+        - created_at
+        - device_id
+      properties:
+        id:
+          type: integer
+          format: int64
+          example: 1
+        device_id:
+          type: integer
+          format: int64
+          example: 1
+        code:
+          type: string
+          example: S123
+        description:
+          type: string
+          example: Pressure sensor at 5 meters depth
+        external_id:
+          type: string
+          example: '5'
+        brand:
+          type: string
+          example: SensorCompany LTD. SCL115
+        archive_time:
+          type: integer
+          example: 7
+        properties:
+          type: object
+          example:
+            mount_height: 15cm
+        created_at:
+          type: string
+          format: date-time
+          example: '2023-05-17T15:00:00Z'
+    device:
+      type: object
+      required:
+        - id
+        - code
+        - state
+        - description
+        - organisation
+        - properties
+        - sensors
+        - created_at
+      properties:
+        id:
+          type: integer
+          format: int64
+          example: 1
+        code:
+          type: string
+          example: mfm1000
+        state:
+          type: integer
+        description:
+          type: string
+          example: Grasfield pipe 24
+        organisation:
+          type: string
+          example: provincie_zeeland
+        properties:
+          type: object
+          example:
+            eui: 060708090A0B0C0D
+        altitude:
+          type: number
+          format: double
+          example: 1.2345
+        latitude:
+          type: number
+          format: double
+          example: 1.2345
+        longitude:
+          type: number
+          format: double
+          example: 1.2345
+        location_description:
+          type: string
+          example: Description of location
+        sensors:
+          type: array
+          items:
+            $ref: '#/components/schemas/sensor'
+        created_at:
+          type: string
+          format: date-time
+    createDeviceRequest:
+      type: object
+      required:
+        - code
+      properties:
+        code:
+          type: string
+          example: mfm1000
+        description:
+          type: string
+          example: Grasfield pipe 24
+        latitude:
+          type: number
+          format: double
+          example: 1.2345
+        longitude:
+          type: number
+          format: double
+          example: 1.2345
+        location_description:
+          type: string
+          example: Description of location
+        properties:
+          type: object
+          example:
+            eui: 060708090A0B0C0D
+    updateDeviceRequest:
+      type: object
+      properties:
+        description:
+          type: integer
+          example: 1
+        latitude:
+          type: number
+          format: double
+          example: 1.2345
+        longitude:
+          type: number
+          format: double
+          example: 1.2345
+        location_description:
+          type: string
+          example: Description of location
+        properties:
+          type: object
+          example:
+            eui: 060708090A0B0C0D
+    createSensorRequest:
+      type: object
+      required:
+        - code
+        - external_id
+      properties:
+        code:
+          type: string
+          example: S123
+        description:
+          type: string
+          example: Pressure sensor at 5 meters depth
+        external_id:
+          type: string
+          example: '5'
+        brand:
+          type: string
+          example: sensor brand ABC
+        properties:
+          type: object
+          example:
+            mount_height: 15cm
+        archive_time:
+          type: integer
+          example: 7
+    sensorGroup:
+      type: object
+      required:
+        - id
+        - name
+        - description
+        - sensors
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+        description:
+          type: string
+        sensors:
+          type: array
+          items:
+            type: integer
+            format: int64
+    createSensorGroupRequest:
+      type: object
+      properties:
+        name:
+          type: string
+        description:
+          type: string
+    updateSensorGroupRequest:
+      type: object
+      properties:
+        name:
+          type: string
+        description:
+          type: string
+    measurement:
+      type: object
+      required:
+        - uplink_message_id
+        - device_id
+        - device_code
+        - device_state
+        - sensor_id
+        - sensor_code
+        - sensor_external_id
+        - datastream_id
+        - datastream_observed_property
+        - datastream_unit_of_measurement
+        - measurement_timestamp
+        - measurement_value
+        - measurement_expiration
+      properties:
+        uplink_message_id:
+          type: string
+          example: ca29e28e-eeb6-4662-922c-6cf6a36ccb6e
+        device_id:
+          type: integer
+          format: int64
+          example: 5
+        device_code:
+          type: string
+          example: mfm1000
+        device_description:
+          type: string
+          example: Particulate matter device
+        device_latitude:
+          type: number
+          format: double
+          example: 5.131313
+        device_longitude:
+          type: number
+          format: double
+          example: 5.131313
+        device_altitude:
+          type: number
+          format: double
+          example: 5.131313
+        device_location_description:
+          type: string
+          example: Grasfield pipe 24
+        device_properties:
+          type: object
+          example:
+            eui: 060708090A0B0C0D
+        device_state:
+          type: integer
+          example: 0
+        sensor_id:
+          type: integer
+          format: int64
+          example: 3
+        sensor_code:
+          type: string
+          example: S123
+        sensor_description:
+          type: string
+          example: Pressure sensor at 5 meters depth
+        sensor_external_id:
+          type: string
+          example: '5'
+        sensor_properties:
+          type: object
+          example: {}
+        sensor_brand:
+          type: string
+          example: SensorCompany Inc. SC123
+        sensor_archive_time:
+          type: integer
+          example: 7
+        datastream_id:
+          type: string
+          format: uuid
+          example: 153205d7-bdfc-4a0b-9de5-c6fa04c665f6
+        datastream_description:
+          type: string
+          example: Concentration of particles smaller than 2.5 micrometer
+        datastream_observed_property:
+          type: string
+          example: pm2.5
+        datastream_unit_of_measurement:
+          type: string
+          example: ug/cm3
+        measurement_timestamp:
+          type: string
+          format: date-time
+          example: '2022-01-01T00:00:00Z'
+        measurement_value:
+          type: number
+          format: double
+          example: 3.44
+        measurement_latitude:
+          type: number
+          format: double
+          example: 3.44
+        measurement_longitude:
+          type: number
+          format: double
+          example: 3.44
+        measurement_altitude:
+          type: number
+          format: double
+          example: 3.44
+        measurement_properties:
+          type: object
+        measurement_expiration:
+          type: string
+          format: date-time
+          example: '2022-01-01T00:00:00Z'
+        created_at:
+          type: string
+          format: date-time
+          example: '2022-01-01T00:00:00Z'
+    datastream:
+      type: object
+      required:
+        - id
+        - description
+        - sensor_id
+        - observed_property
+        - unit_of_measurement
+        - created_at
+      properties:
+        id:
+          type: string
+          format: uuid
+        description:
+          type: string
+        sensor_id:
+          type: integer
+        observed_property:
+          type: string
+        unit_of_measurement:
+          type: string
+          format: ucum
+        created_at:
+          type: string
+          example: '2022-01-01T00:00:00Z'
+    pipeline:
+      type: object
+      required:
+        - id
+        - description
+        - steps
+        - status
+        - last_status_change
+      properties:
+        id:
+          type: string
+          example: 9d4a0944-c11d-42ef-880f-a97c9619c5c0
+        description:
+          type: string
+          example: Pipeline for Multiflexmeter Groundwater devices
+        steps:
+          type: array
+          items:
+            type: string
+          example:
+            - TTN@1.0.0
+            - MFMGroundwater@1.0.0
+        status:
+          type: string
+          description: either active or inactive
+          example: active
+        last_status_change:
+          type: string
+          format: date-time
+          example: '2022-01-01T00:00:00Z'
+        created_at:
+          type: string
+          format: date-time
+          example: '2022-01-01T00:00:00Z'
+    createPipelineRequest:
+      type: object
+      properties:
+        description:
+          type: string
+          example: Pipeline for Multiflexmeter Groundwater devices
+        steps:
+          type: array
+          items:
+            type: string
+          example:
+            - TTN@1.0.0
+            - MFMGroundwater@1.0.0
+    updatePipelineRequest:
+      type: object
+      properties:
+        description:
+          type: string
+          example: Pipeline for Multiflexmeter Groundwater devices
+        steps:
+          type: array
+          items:
+            type: string
+          example:
+            - TTN@1.0.0
+            - MFMGroundwater@1.0.0
+        status:
+          type: string
+          description: |
+            Used to change a pipeline from inactive to active or vice-versa. 
+            Moving from active to inactive can also be achieve by `DELETE`ing the pipeline resource.
+          example: active
+    trace_step:
+      type: object
+      required:
+        - status
+        - status_string
+        - duration
+        - error
+      properties:
+        start_time:
+          type: string
+          format: date-time
+        status:
+          type: integer
+          example: 2
+        status_string:
+          type: string
+          example: succes
+        duration:
+          type: number
+          format: double
+          description: Duration in seconds
+          example: 5.321
+        error:
+          type: string
+    trace:
+      type: object
+      required:
+        - tracing_id
+        - device_id
+        - start_time
+        - steps
+        - status
+        - status_string
+      properties:
+        tracing_id:
+          type: string
+          example: a59d28c8-2a0f-4e89-9f49-6942f1c04342
+        device_id:
+          type: integer
+          format: int64
+          example: 37
+          description: id is 0 if not defined
+        start_time:
+          type: string
+          format: date-time
+        status:
+          type: integer
+          example: 2
+        status_string:
+          type: string
+          example: succes
+        steps:
+          type: array
+          items:
+            $ref: '#/components/schemas/trace_step'
+    apiError:
+      type: object
+      properties:
+        message:
+          type: string
+        code:
+          type: string
+        http_status:
+          type: integer
+    ingressDTO:
+      type: object
+      required:
+        - tracing_id
+        - pipeline_id
+        - owner_id
+        - payload
+        - created_at
+      properties:
+        tracing_id:
+          type: string
+          format: uuid
+        pipeline_id:
+          type: string
+          format: uuid
+        owner_id:
+          type: integer
+          format: int64
+        payload:
+          type: string
+          format: base64
+        created_at:
+          type: string
+          format: date-time
+    archivedIngress:
+      type: object
+      required:
+        - tracing_id
+        - raw_message
+        - archived_at
+        - expires_at
+      properties:
+        tracing_id:
+          type: string
+          format: uuid
+        raw_message:
+          type: string
+          format: base64
+        archived_at:
+          type: string
+          format: date-time
+        expires_at:
+          type: string
+          format: date-time
+        ingress_dto:
+          $ref: '#/components/schemas/ingressDTO'
+    userWorker:
+      type: object
+      required:
+        - id
+        - name
+        - description
+        - state
+        - language
+        - organisation
+        - revision
+        - status
+      properties:
+        id:
+          type: string
+          format: uuid
+        name:
+          type: string
+        description:
+          type: string
+        state:
+          type: string
+          enum:
+            - enabled
+            - disabled
+        language:
+          type: string
+          enum:
+            - python
+        organisation:
+          type: integer
+          format: int64
+        revision:
+          type: integer
+        status:
+          type: string
+          enum:
+            - unknown
+            - ready
+            - error
+    createUserWorkerRequest:
+      type: object
+      required:
+        - name
+        - user_code
+      properties:
+        name:
+          type: string
+        description:
+          type: string
+        user_code:
+          type: string
+          format: base64
+          description: base64 encoded user code
+        state:
+          type: string
+          enum:
+            - enabled
+            - disabled
+    updateWorkerRequest:
+      type: object
+      properties:
+        name:
+          type: string
+        description:
+          type: string
+        state:
+          type: string
+          enum:
+            - enabled
+            - disabled
+        user_code:
+          type: string
+          format: base64
+          description: base64 encoded user code
+    tenant:
+      type: object
+      required:
+        - id
+        - name
+        - address
+        - zip_code
+        - city
+      properties:
+        id:
+          type: integer
+          format: int64
+          example: 1
+        name:
+          type: string
+          example: Provincie Zeeland
+        address:
+          type: string
+          example: Zeeland
+        zip_code:
+          type: string
+          example: 4331 ZE
+        city:
+          type: string
+          example: Vlissingen
+        chamber_of_commerce_id:
+          type: string
+        headquarter_id:
+          type: string
+    addTenantMemberRequest:
+      type: object
+      required:
+        - user_id
+        - permissions
+      properties:
+        user_id:
+          type: string
+        permissions:
+          type: array
+          items:
+            type: string
+    updateTenantMemberRequest:
+      type: object
+      required:
+        - permissions
+      properties:
+        permissions:
+          type: array
+          items:
+            type: string
+    apiKey:
+      type: object
+      required:
+        - id
+        - name
+        - tenant_id
+        - tenant_name
+        - created
+      properties:
+        id:
+          type: integer
+          format: int64
+          example: 1
+        name:
+          type: string
+          example: Provincie Zeeland
+        tenant_id:
+          type: integer
+          format: int64
+          example: 19
+        tenant_name:
+          type: string
+          example: Provincie Zeeland
+        expiration_date:
+          type: string
+          format: date-time
+          example: '2023-05-17T15:00:00Z'
+        created:
+          type: string
+          format: date-time
+          example: '2022-05-17T15:00:00Z'
+    createApiKeyRequest:
+      type: object
+      required:
+        - name
+        - tenant_id
+      properties:
+        name:
+          type: string
+          example: Device Beheerder
+        tenant_id:
+          type: integer
+          format: int64
+          example: 19
+        permissions:
+          type: array
+          items:
+            type: string
+        expiration_date:
+          type: string
+          format: date-time
+          example: '2023-05-17T15:00:00Z'
+    apiKeyCreated:
+      type: object
+      required:
+        - api_key
+      properties:
+        api_key:
+          type: string
+          example: MjU5MzE1NDgwMjE2NTMwMTEyODo2MjY2MDdkMGViY2Q5MGRhMTRkZWE4NGY4MjEzYjRiNw
+  responses:
+    '400':
+      description: The request failed because of a malformed or invalid request
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/apiError'
+    '401':
+      description: The request failed because the provided credentials are invalid or missing
+    '403':
+      description: The request failed because the provided credentials do not have the required permissions to perform this action
+    '404':
+      description: The request failed because the requested resource could not be found
+    '500':
+      description: The request failed because of an unexpected server error
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/apiError'
+x-oathkeeper-mutators:
+  - Hydrate
+  - IDToken
diff --git a/tools/oathkeeper/generated_rules.json b/tools/oathkeeper/generated_rules.json
new file mode 100644
index 00000000..562e3e87
--- /dev/null
+++ b/tools/oathkeeper/generated_rules.json
@@ -0,0 +1 @@
+[{"id":"OASAPI:ListWorkers","description":"Lists traces that match the provided filter.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/workers"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:CreateWorker","description":"Create a new worker\n","match":{"methods":["POST"],"url":"https://acc.sensorbucket.nl/api/workers"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:ListTraces","description":"Lists traces that match the provided filter.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/tracing"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:ListTenants","description":"Lists Tenants\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/tenants"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:ListSensors","description":"List all sensors.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/sensors"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:ListSensorGroups","description":"Fetch a list of sensor groups.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/sensor-groups"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:CreateSensorGroup","description":"Create a new sensor group.\n","match":{"methods":["POST"],"url":"https://acc.sensorbucket.nl/api/sensor-groups"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:ListPipelines","description":"List pipelines. By default only `state=active` pipelines are returned.\nBy providing the query parameter `inactive` only the inactive pipelines will be returned.\n\nPipelines can be filtered by providing one or more `step`s. This query parameter can be repeated to include more steps.\nWhen multiple steps are given, pipelines containing one of the given steps will be returned.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/pipelines"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:CreatePipeline","description":"Create a new pipeline. \n\nA pipeline determines which workers, in which order the incoming data will be processed by.\n\nA pipeline step is used as routing key in the Message Queue. This might be changed in future releases.\n\n**Note:** currently there are no validations in place on whether a worker for the provided step actually exists.\n","match":{"methods":["POST"],"url":"https://acc.sensorbucket.nl/api/pipelines"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:QueryMeasurements","description":"Query a list of measurements.\n\nThis endpoint is used to get all measurements that correspond with the given filters.\n\nIt is commonly required to get a single stream of measurements from a single sensor. This can be accomplished by \nfinding the corresponding datastream ID and using that in the `datastream` filter. \n\nMost query parameters can be repeated to get an OR combination of filters. For example, providing the `datastream` \nparameter twice will return measurements for either datastreams.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/measurements"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:ListIngresses","description":"Lists ingresses that match the provided filter.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/ingresses"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:ListDevices","description":"Fetch a list of devices.\n\nDevices can be filtered on three items: properties, distance from a location or a bounding box.\n - Filtering on properties filters devices on whether their property attribute is a superset of the given JSON object value\n - Distance from location filtering requires a latitude, longitude and distance (in meters). All devices within that range will be returned\n - Bounding box requires a North,East,South and West point. All devices within that box will be returned.\n\nThe filters distance from location and bounding box are mutually exclusive. The location distance filter will take precedence.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/devices"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:CreateDevice","description":"Create a new device.\n\nDepending on the type of device and the network it is registered on. The device might need specific properties to be set.  \n**For example:** A LoRaWAN device often requires a `dev_eui` property to be set. The system will match incoming traffic against that property.\n","match":{"methods":["POST"],"url":"https://acc.sensorbucket.nl/api/devices"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:ListDatastreams","description":"List all datastreams.\n\nA sensor can produce one or more timeseries of measurements. Such a unique timeserie is called a datastream.  \n\n**For example:** A Particulate Matter sensor might return count the number of particles smaller than 2.5 μg/cm2, 5 μg/cm2 and 10 μg/cm2.\nthis is one sensor producing three datastreams.\n\nAnother example would be a worker which processes raw incoming values into meaningful data.\nAn underwater pressure sensor might supply its measurement in milli Amperes, but the worker converts it to watercolumn in meters.\nThe sensor now has two datastreams. Presusre in millivolt and watercolumn in meters.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/datastreams"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:ListApiKeys","description":"Lists API Keys\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/api-keys"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:CreateApiKey","description":"Create an API key for a tenant with an expiration date. Permissions for the API key within that organisation must be set\n","match":{"methods":["POST"],"url":"https://acc.sensorbucket.nl/api/api-keys"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:GetWorkerUserCode","description":"Get the worker with the given identifier.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/workers/\u003c[a-zA-Z0-9-_%]*\u003e/usercode"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:GetWorker","description":"Get the worker with the given identifier.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/workers/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:UpdateWorker","description":"Update a some properties of the worker with the given identifier.\n\nThe request body should contain one or more modifiable properties of the Worker.\n","match":{"methods":["PATCH"],"url":"https://acc.sensorbucket.nl/api/workers/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:processUplinkData","description":"Push an uplink message to the HTTP Importer for processing.\n\nThe request body and content-type can be anything the workers (defined by the pipeline steps) in the pipeline expect.\n\nAs this process is asynchronuous, any processing error will not be returned in the response.\nOnly if the HTTP Importer is unable to push the message to the Message Queue, will an error be returned. \n","match":{"methods":["POST"],"url":"https://acc.sensorbucket.nl/api/uplinks/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:AddTenantMember","description":"Adds a user with the specific ID to the given Tenant as a member with the given permissions\n","match":{"methods":["POST"],"url":"https://acc.sensorbucket.nl/api/tenants/\u003c[a-zA-Z0-9-_%]*\u003e/members"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:AddSensorToSensorGroup","description":"Add a sensor by its ID to a sensor group by its ID\n","match":{"methods":["POST"],"url":"https://acc.sensorbucket.nl/api/sensor-groups/\u003c[a-zA-Z0-9-_%]*\u003e/sensors"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:GetSensorGroup","description":"Get the sensor group with the given identifier.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/sensor-groups/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:UpdateSensorGroup","description":"Update a some properties of the sensor group with the given identifier.\n\nThe request body should contain one or more modifiable properties of the sensor group.\n","match":{"methods":["PATCH"],"url":"https://acc.sensorbucket.nl/api/sensor-groups/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:DeleteSensorGroup","description":"Delete a sensor group\n","match":{"methods":["DELETE"],"url":"https://acc.sensorbucket.nl/api/sensor-groups/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:GetPipeline","description":"Get the pipeline with the given identifier.\n\nThis endpoint by default returns a 404 Not Found for inactive pipelines.\nTo get an inactive pipeline, provide the `status=inactive` query parameter.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/pipelines/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:UpdatePipeline","description":"Update some properties of the pipeline with the given identifier. \n\nSetting an invalid state or making an invalid state transition will result in an error.\n","match":{"methods":["PATCH"],"url":"https://acc.sensorbucket.nl/api/pipelines/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:DisablePipeline","description":"Disables a pipeline by setting its status to inactive.\n\nInactive pipelines will - by default - not appear in the `ListPipelines` and `GetPipeline` endpoints,\nunless the `status=inactive` query parameter is given on that endpoint.\n","match":{"methods":["DELETE"],"url":"https://acc.sensorbucket.nl/api/pipelines/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:GetDevice","description":"Get the device with the given identifier.\n\nThe returned device will also include the full model of the sensors attached to that device.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/devices/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:UpdateDevice","description":"Update a some properties of the device with the given identifier.\n\nThe request body should contain one or more modifiable properties of the Device.\n","match":{"methods":["PATCH"],"url":"https://acc.sensorbucket.nl/api/devices/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:ListDeviceSensors","description":"List all sensors related to the device with the provided identifier\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/devices/\u003c[a-zA-Z0-9-_%]*\u003e/sensors"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:CreateDeviceSensor","description":"Create a new sensor for the device with the given identifier.\n\nA device can not have sensors with either a duplicate `code` or duplicate `external_id` field.\nAs this would result in conflicts while matching incoming messages to devices and sensors.\n","match":{"methods":["POST"],"url":"https://acc.sensorbucket.nl/api/devices/\u003c[a-zA-Z0-9-_%]*\u003e/sensors"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:GetDatastream","description":"Get the datastream with the given identifier.\n\nThe returned datastream will also include the full model of the sensors attached to that datastream.\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/datastreams/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:GetAPIKey","description":"Get an API Key by ID\n","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/api/api-keys/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:RevokeApiKey","description":"Revokes an API key so that it can't be used anymore\n","match":{"methods":["DELETE"],"url":"https://acc.sensorbucket.nl/api/api-keys/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:UpdateTenantMember","description":"Update a tenant member's permissions\n","match":{"methods":["PATCH"],"url":"https://acc.sensorbucket.nl/api/tenants/\u003c[a-zA-Z0-9-_%]*\u003e/members/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:RemoveTenantMember","description":"Removes a member by the given user id from a tenant\n","match":{"methods":["DELETE"],"url":"https://acc.sensorbucket.nl/api/tenants/\u003c[a-zA-Z0-9-_%]*\u003e/members/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:DeleteSensorFromSensorGroup","description":"Delete a sensor from a sensor group\n","match":{"methods":["DELETE"],"url":"https://acc.sensorbucket.nl/api/sensor-groups/\u003c[a-zA-Z0-9-_%]*\u003e/sensors/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"OASAPI:DeleteDeviceSensor","description":"Delete a sensor from the system. \n\nSince a sensor can only be related to one and only one device at a time, the sensor will be deleted from the system completely\n","match":{"methods":["DELETE"],"url":"https://acc.sensorbucket.nl/api/device/\u003c[a-zA-Z0-9-_%]*\u003e/sensors/\u003c[a-zA-Z0-9-_%]*\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"bearer_token"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"Manual:TenantsAuthCheck","description":"Check auth token","match":{"methods":["GET"],"url":"https://acc.sensorbucket.nl/tenants/auth"},"authenticators":[{"handler":"bearer_token"},{"handler":"cookie_session"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"Manual:TenantsPublicStatic","description":"Static UI Files","match":{"methods":["GET","POST","PATCH","PUT","DELETE","OPTION"],"url":"https://acc.sensorbucket.nl/tenants/static/\u003c.+\u003e"},"authenticators":[{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"noop"}],"errors":[]},{"id":"Manual:Dashboard","description":"Dashboard (sub)paths","match":{"methods":["GET","POST","PATCH","PUT","DELETE","OPTION"],"url":"https://acc.sensorbucket.nl/dashboard\u003c(/.+)?\u003e"},"authenticators":[{"handler":"cookie_session"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"Manual:TenantsAuthLogin","description":"Login flow","match":{"methods":["GET","POST","PATCH","PUT","DELETE","OPTION"],"url":"https://acc.sensorbucket.nl/tenants/auth/login"},"authenticators":[{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"noop"}],"errors":[]},{"id":"Manual:TenantsAuthSettings","description":"Settings flow","match":{"methods":["GET","POST","PATCH","PUT","DELETE","OPTION"],"url":"https://acc.sensorbucket.nl/tenants/auth/settings"},"authenticators":[{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"noop"}],"errors":[]},{"id":"Manual:TenantsSwitch","description":"Switch tenants flow","match":{"methods":["GET","POST","PATCH","PUT","DELETE","OPTION"],"url":"https://acc.sensorbucket.nl/tenants/switch"},"authenticators":[{"handler":"cookie_session"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]},{"id":"Manual:TenantsAPIKeys","description":"APIKeys ui","match":{"methods":["GET","POST","PATCH","PUT","DELETE","OPTION"],"url":"https://acc.sensorbucket.nl/tenants/api-keys"},"authenticators":[{"handler":"cookie_session"},{"handler":"noop"}],"authorizer":{"handler":"allow"},"mutators":[{"handler":"hydrator"},{"handler":"id_token"}],"errors":[]}]
diff --git a/tools/oathkeeper/manual_rules.toml b/tools/oathkeeper/manual_rules.toml
new file mode 100644
index 00000000..e70e21ff
--- /dev/null
+++ b/tools/oathkeeper/manual_rules.toml
@@ -0,0 +1,48 @@
+[Rules.Dashboard]
+Description = "Dashboard (sub)paths"
+Authenticators = ["CookieSession", "Noop"]
+Mutators = ["Hydrate", "IDToken"]
+Path = "/dashboard<(/.+)?>"
+Methods = ["GET","POST","PATCH","PUT","DELETE","OPTION"]
+
+[Rules.TenantsAuthLogin]
+Description = "Login flow"
+Authenticators = ["Noop"]
+Mutators = ["Noop"]
+Path = "/tenants/auth/login"
+Methods = ["GET","POST","PATCH","PUT","DELETE","OPTION"]
+
+[Rules.TenantsAuthSettings]
+Description = "Settings flow"
+Authenticators = ["Noop"]
+Mutators = ["Noop"]
+Path = "/tenants/auth/settings"
+Methods = ["GET","POST","PATCH","PUT","DELETE","OPTION"]
+
+[Rules.TenantsSwitch]
+Description = "Switch tenants flow"
+Authenticators = ["CookieSession", "Noop"]
+Mutators = ["Hydrate", "IDToken"]
+Path = "/tenants/switch"
+Methods = ["GET","POST","PATCH","PUT","DELETE","OPTION"]
+
+[Rules.TenantsAPIKeys]
+Description = "APIKeys ui"
+Authenticators = ["CookieSession", "Noop"]
+Mutators = ["Hydrate", "IDToken"]
+Path = "/tenants/api-keys"
+Methods = ["GET","POST","PATCH","PUT","DELETE","OPTION"]
+
+[Rules.TenantsAuthCheck]
+Description = "Check auth token"
+Authenticators = ["APIKey", "CookieSession", "Noop"]
+Mutators = ["Hydrate", "IDToken"]
+Path = "/tenants/auth"
+Methods = ["GET"]
+
+[Rules.TenantsPublicStatic]
+Description = "Static UI Files"
+Authenticators = ["Noop"]
+Mutators = ["Noop"]
+Path = "/tenants/static/<.+>"
+Methods = ["GET","POST","PATCH","PUT","DELETE","OPTION"]
diff --git a/tools/oathkeeper/openkeeper.toml b/tools/oathkeeper/openkeeper.toml
new file mode 100644
index 00000000..442fba80
--- /dev/null
+++ b/tools/oathkeeper/openkeeper.toml
@@ -0,0 +1,20 @@
+[Oathkeeper.Authenticators.CookieSession]
+Handler = "cookie_session"
+[Oathkeeper.Authenticators.APIKey]
+Handler = "bearer_token"
+[Oathkeeper.Authenticators.Noop]
+Handler = "noop"
+[Oathkeeper.Mutators.Hydrate]
+Handler = "hydrator"
+[Oathkeeper.Mutators.IDToken]
+Handler = "id_token"
+[Oathkeeper.Mutators.Noop]
+Handler = "noop"
+
+[OpenAPI3.OASAPI]
+File = "bundled_openapi.yaml"
+Domains = ["https://acc.sensorbucket.nl/api"]
+
+[TOML.Manual]
+File = "manual_rules.toml"
+Domains = ["https://acc.sensorbucket.nl"]
diff --git a/tools/openapi/api.yaml b/tools/openapi/api.yaml
index 31465eae..4e097c8b 100644
--- a/tools/openapi/api.yaml
+++ b/tools/openapi/api.yaml
@@ -14,7 +14,7 @@ info:
 
     Find out more at: https://developer.sensorbucket.nl/
 
-    Developed and designed by Provincie Zeeland and Pollex
+    Developed and designed by Provincie Zeeland and Pollex'
   contact:
     name: Tim van Osch
     email: info@pollex.nl
@@ -22,8 +22,6 @@ info:
 servers:
   - description: Production
     url: 'https://sensorbucket.nl/api'
-  - description: Local docker environment
-    url: 'http://localhost:3000/api'
 paths: 
   /devices:
     $ref: 'path-devices.yaml'
@@ -77,13 +75,23 @@ paths:
     $ref: 'path-api-keys-by-id.yaml'
 components:
   securitySchemes:
-    basicAuth:
+    CookieSession:
       description: |
-        Temporary default authentication method until token based authentication is implemented.
+        When a user is logged in a session cookie will be set which authenticates the user.
+      type: apiKey
+      in: cookie
+      name: SID
+    APIKey:
+      description: |
+        An API Key given through the Authorization header will authenticate an organisation
       type: http
-      scheme: basic
+      scheme: Bearer
+x-oathkeeper-mutators:
+  - Hydrate
+  - IDToken
 security:
-  - basicAuth: []
+  - CookieSession: []
+  - APIKey: []
 tags:
   - name: Devices
   - name: Pipelines