diff --git a/vars/per-machine/verbena/buildbot/api-token/secret b/vars/per-machine/verbena/buildbot/api-token/secret
index b13afab..e35610a 100644
--- a/vars/per-machine/verbena/buildbot/api-token/secret
+++ b/vars/per-machine/verbena/buildbot/api-token/secret
@@ -1,18 +1,18 @@
 {
-	"data": "ENC[AES256_GCM,data:ieqRFglOHi9R4+o/pVhxP9WJ/eHgxB3BP8BMVUKSPkqrLZmjhL2wZg==,iv:VhMxk+6SDGy06ay3ZVtuqB8xbydB90QMiyJ06eaHs7U=,tag:hkFyWg7nK41qvrxvasrK4w==,type:str]",
+	"data": "ENC[AES256_GCM,data:IGlceGAAyveds7pvIuC1WazMkK94yN582Z0Jf8rLiyaCFtJHGD0+Hg==,iv:81/+F9CKvSE/wzdaNheOym6hN04PEutVvnqnQSR/Amc=,tag:8t5SO+Sv3n8Iq4gaq+4AzA==,type:str]",
 	"sops": {
 		"age": [
 			{
 				"recipient": "age1mqnmzn203hyj200psc982ehcedjmcdz8s0ncc50fm9jszjx7rgmqqmppw5",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPblVqYmg1N1hBUVBRaCsx\nU1NScVdBdGFTYjl4aWZZME9rZkVOZTU1MEFzClVsTXMxV0FDcUo1dEwxTStFTE1s\nWVBkUzcyN2MwN2dJcHA5RXBSRUJtMncKLS0tIFpUejUxdkMzTFZJcVBoOEptL0U4\nVXZqWEtYbzlJb0NjcUlkbGNGT1hSbjAKH4pFn+D08fM+wjqMMPf5DdQv5kHM/puQ\nFTyRfQdUMtBLw2TaaF8ASP/McBpO36UbvAoXHJ1Oah0xPG4s82Bv7A==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNUVlSNzJKY3YzZHZhaitI\neEkwR0hQTDBDTzNVVXIrMjlpZWt1Z01JUDFBCmZ5NlQ5ZUpyMFhKWHY0dEpEajZx\nOHluNGc0OG1SUXpPMnoyWFQ2YkJzMW8KLS0tIEFubk13c1RyYm5KWmxqQitNMWhF\nOEpIMUwzMmE0RHNZWjZTZEcxYU1HWHcKDOE81K69vsESELhRLtpYqxW7OCSXnTKe\nEkg2E8y7kD/T13s0IpE43nrOw+R8fNqgEdHvTy6ql1PwrS5lb/fLAg==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1teege0n8gf9qcheuxtpy7cltf8aczt9ugh8ztp9v4fftn3wwd4jsz0lpeh",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBVjc2VDQ0U1lCaWNGWlVH\nS1V1SEhiSzV3ZGVLaGUzNzMyZWRWTkpjV1ZBClYzQWl0WndpVWYwS2ZzeStXVlBq\nMllHUXZtQnBvQWkvYTFMczVSaUdicTQKLS0tIFBKNjZqdW43RCtoTDQvcWhqODZv\nanpQQ1ZYQkE3MUNudjRrRjc2K0l4b2sKetdtcQj7LLgLDbf2Ja+/w7pWCu8kMhK+\nbaDKW0ornLk7t2JU3POwaSjS+K54Ki8MIjWNqN4KrB75TF4zJMdjHA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzaGI2V0xjcGYyZzNvNDY1\nTE5VVWw2cGRnSW4rWnAxeEI2ZW1wbVFGaUZRClZSSThqdUl3QzZnbHhKU1NHMFpL\nSDh4TGhjSzIvT1M3NExYSEVkbEc5NjgKLS0tIFlrZ2NYN0sxeEcrTVFWalVJRDhR\nOEpRcTZuWWZxeHU0UFh1T3JzakEvZTgKuqmCSke0nCuXx/QxD6tVFtoABqI4It0Y\nDeJiPjua36ZkKo86DMkebMQWXJnLxqYiLm79n/nv2wHaZvq5Hy3nLg==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-09-30T18:24:06Z",
-		"mac": "ENC[AES256_GCM,data:CvYQFkSwPfQC8oKXzTy/kAm+ww4NKaw4K8EZ8wotJf2Hd78rB/tZAdKV0QzBc9i6VYR2eQvuKrj+Cui2eX2qEtscuwgrG+AH1NN9ww8HlXPeoqoDekjxiUY2UO0xVwpLmVQsWR1bPyfIbcXpyzXUAvklBfajK61UbZbWi6FRUks=,iv:kF0SPX9Z53ksGjsiIH3wgDbTlwxrCGE6FVWe9ICKMQU=,tag:3aBBQ3Ux0RlXfkAvH8JKQw==,type:str]",
+		"lastmodified": "2025-09-30T19:48:04Z",
+		"mac": "ENC[AES256_GCM,data:yRIIB3qMjfarCxds83m4Am9h9JpsAsy2WnwQPabTLa+lkbXx+jFMwa1TWbLpPkxjgZaMIktsef0OzNMIbgEDK11hNItsUzb6e7/29WywCuQvISy6NlWUdA71yvGxHhnpVkbpQ/Q2SGg8gdNIGVU8BsK1/2PQoDKmYOrVihs7ws0=,iv:UJowwxtUm+9nu51U061g7KbnDpxSiB9c/pOD+GgAdGI=,tag:0UbhR4cldFI7We3z4Vae3A==,type:str]",
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.10.2"
 	}
diff --git a/vars/per-machine/verbena/buildbot/oauth-secret/secret b/vars/per-machine/verbena/buildbot/oauth-secret/secret
index 9564f5f..d12e694 100644
--- a/vars/per-machine/verbena/buildbot/oauth-secret/secret
+++ b/vars/per-machine/verbena/buildbot/oauth-secret/secret
@@ -1,18 +1,18 @@
 {
-	"data": "ENC[AES256_GCM,data:umhclAvia7ePqxzD7rau06EJs0G1uylmw5Jp4S3ywzaERoqCa22NNjXQfqdLghU9Ckw8Dxleiy8=,iv:eHy/u0nHDT4934Zwe3yHbHBpxNXO+H4xqJ9Pgo146qQ=,tag:c7O5Jqxt40/rA8YXBsDWhA==,type:str]",
+	"data": "ENC[AES256_GCM,data:HkEa0t0H7DOsoKn0luPTgv/ExIp4suYngtjLBJTXEhgCQvEflUi0/iyxnOgGEchTdK9xRYyXyrQ=,iv:CgnhjxTllnrlgcH+33MvPZZY3boqkhEVZdW5LEyuXMY=,tag:RIOSvT0fMurb1a48xa7ApQ==,type:str]",
 	"sops": {
 		"age": [
 			{
 				"recipient": "age1mqnmzn203hyj200psc982ehcedjmcdz8s0ncc50fm9jszjx7rgmqqmppw5",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpOU9iVXBWRmQ0cUdTZ0xh\ncVNaaVhRcC9RcUhvUTY4VFFXWGdHQlhONEJzClcxaEtnZkh4TGdXWHo4Tm54b21o\nRTFDWHg0RGdvM1dlVWFuUEU4YXhRZGsKLS0tIDdvVDJqMUR6T3V3YkNKaERjQ2FB\nKzQwdFNlK3dVUldzR1luallpb3Z4elEKzPZXRbNgO7V/yQVO1eobDK+uza2UA+gN\nfjr2iQ4eg7MpFvGUWXWPtoA0137g4gsxhEiUjtPqSP+B/qOPXIhYkA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBYkF0V25hVGtuT2NjTjJh\nbHhoSldnMTE4cHVQNWtrSVBJYmpkbUJwaXdjCk9Td2ZzR1RMN1l6ZitBL3Z3QUVm\nY2FnVnJnYitESDRMQ3BFNTRGNE9jTlEKLS0tIEJkSXBNRUVrc3U1Y1poT2dFRjdJ\naUVLbEs0ZjlQemQ3TmcwZmkyUTVRSVUKJ9QfIdh7US28wDJtNhbugs4Un4hnNobG\nbjzI/HNbCRtwRUXamKZI9JvXVH7/cSpsNvN7AkgEy/6033xuxgjHww==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1teege0n8gf9qcheuxtpy7cltf8aczt9ugh8ztp9v4fftn3wwd4jsz0lpeh",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmT3ZYa0pGL2duR0xwTmpU\na0pzRUI0STA5aG1ZMWdXZDVjVnp2UFJoRnd3Ck91NlQrQ1k4d2lNWGw5K2ZxSmp1\nQnlFQ3AyTEl4cWZUSGtTVTFPVkcvcU0KLS0tIDlleHRZWUpXcnovUlgxMUNwVzlH\nSkpRY1N0MzJ4NUlObVR6Q1BXVlJBSFEK/docMsaQrjDtjE2+tZ+C2+jmLqjH4mo3\nc3xbf0ufgtNFb3lHcKS13VPjEbmsb1u1YP/yHTUO911youQLqQohFg==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhWU5oRW5aOFJSVmtGcGxM\nd2VNSmpISHZ1UDdmNThVQWIwWTBIL1ovM2tRCk9mL0oyZzJwZGE4WDRNV0xpMWl3\nMWt6NFRFSGRQRDNlaDhsdDBJWkZQaGMKLS0tIGJMdVZ0WlNiVllFWm42OGdGOUcz\nUGhXcjRHckVKMDdCRzg3cTc2ZUFYaWsKX2idkx3spVL/Sz09ky5+LZWu4ywxz4cb\nbqQBra26KEv9yBDRwXFwq5oks/HDLRK0zaKRrwNjuoAAQkvzAypniA==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-09-30T18:24:06Z",
-		"mac": "ENC[AES256_GCM,data:FutR14hBi6kHKSGixhtA60XUckCa2fAaSHcwKxxucZBfGucWTtdlM5wM9nchVcQtGGsCrXdxvonwQy5+aOUPdCN0G6RKXkHhVJMLitQrfNOHVNuDPAYyj/zERgRiLJ81HSpVrDwCQeKE8P0xs8Im9qfUREvO9QjHT8nF+5Govp0=,iv:pZvNbDUhdi8UG549OT3C5ZQPLP2KoRYSjaqkvL5gb5M=,tag:tYXQs/3hL0qD5CcM0lE0JA==,type:str]",
+		"lastmodified": "2025-09-30T19:48:05Z",
+		"mac": "ENC[AES256_GCM,data:h7z2W2u2bDmy2zMvsg9vhtVvrej+YghbSSg8KNnl/Mke/gDvKn20lmU0imlZBfxc2b9ElwCEfGMy0ndKjw9K9s5MD0ypzCfs1X3ztDNr95oGOLcdM1IHbVR2v8SP4y8K4RUdsMC5FUPHruEzqCYMnV7lwdgvo/ljn78DsJDAbRg=,iv:2kZRL13Q+5vrn1cAn41QUZGd0fBo23RQSYH3OM/VzBE=,tag:h3wBHIESbsZ6FvrMBQPMhw==,type:str]",
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.10.2"
 	}
diff --git a/vars/per-machine/verbena/buildbot/webhook-secret/secret b/vars/per-machine/verbena/buildbot/webhook-secret/secret
index b0225dc..c82e335 100644
--- a/vars/per-machine/verbena/buildbot/webhook-secret/secret
+++ b/vars/per-machine/verbena/buildbot/webhook-secret/secret
@@ -1,18 +1,18 @@
 {
-	"data": "ENC[AES256_GCM,data:WQzQ,iv:Plvkqh/yH9JfWx4Wuh76a7U415ZGtAeLJo1eIt27l1g=,tag:f/Ca7j1WdWxY5dkv7+dwYQ==,type:str]",
+	"data": "ENC[AES256_GCM,data:NrVd,iv:vogGVxZ1Nc57wg6hdXR9KbZPvqfALEx68qUbrE2RFYU=,tag:xiU+h0Icw4IzL3z2oqjiWg==,type:str]",
 	"sops": {
 		"age": [
 			{
 				"recipient": "age1mqnmzn203hyj200psc982ehcedjmcdz8s0ncc50fm9jszjx7rgmqqmppw5",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrQXp3dTlZaTNwaXVLVmdZ\nVStxNXNJMXdIbEhGbHhtZGptZHl0RXpzeHhnCmlqWHB1bThiZ1c2aFFiMzJQY21X\nRVJXclNUQmJDMVh0dFVlYUlpNlNubTQKLS0tIGIvVVkreGtNS0tIQ0tkaEdyeEMx\naDFUWmE2K1VWOWU5OEZBOHJrUXhCUVUKzspIcHIedVSn04sIS4/et1PWfx8U9DBd\nXqR+qxRMkhwL4ggLTdwbLjbV8VaDtKglmt6Fe9T0kGQV1Rd1qq4reg==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRV1lOa3ZTaEpxZDJ1cVZp\ndmFzYk1NREVDUGtQbXJhazJjL3gzWmpFZlc4Ckt6YlFWQVpUT1QrRVVoTXBlN3Z4\ndVVjd25tdTN1bmlYV2UzNEltYW1pdDQKLS0tIGcxS1JncXM1WE9USmljd3k0K1lG\nbTJWWlhrU1IrWFZob3grUU43bUZyN1kKkn5mzN6KqxtGCI9JlHUPmylg3A4GYDr6\nL2BJV1CTQT85bF09kCsgAu0dbDChJVYhdWiA4ZFJ/qqcPwAnI1qjfg==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1teege0n8gf9qcheuxtpy7cltf8aczt9ugh8ztp9v4fftn3wwd4jsz0lpeh",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhK0o0ZlpJTmJ1VlhRMDNm\nK0ZPcC9KVWZwTUxXYjI1U3h5dWtSZEdRR3g0CmVkem8rd3ZQSDNHQnNQSkxlMVlJ\nUU0yeUVNWERPalNJV1lMbTNScG4zYnMKLS0tIG11ZWpiYVFRSFVmdm9qVHpVemc1\nVEZnS0g4SHlqQ1c0NFRzT3pLdXF5S00K7XuyE7LftC5Sa6DDEndTvUb78p12oKR7\n/awo+6i8/LWYl6GHAx6xrAe2iXsk31nS4a3MwL1MwUyreT8TBO56MA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5QjMxbkwvK0R1c0ZLSGFv\ndE9pbU1UcGgwWmVUU0NpQ2RiM2dReTcwOVZRCk4zVlF1VE5qS3ZxOWZBQ0MzL2NC\nMnI0TmtXblRyMHFEbVl5aTRHS0ZKMncKLS0tIHk2STFoa1pOek9hcXF0cENCOEkw\nWWxqU3JQcDlTSGJJeUVqbFlqZXlrVG8K+863BGkKA+e843msFNbEEIowhNdKFKuU\nKt8xDehW3KhfRmRlpmzfEmEfk9cQ4eXSqmkL0in/E8wYKCTgEsPysQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-09-30T18:24:06Z",
-		"mac": "ENC[AES256_GCM,data:FgvLYa1jskrzQR9hx4TAzGpPGJMOlrlNHt1U7EsKPhGsdRMs+/ZeHPHO1nqR8iPnv8H7oSPGFGA8u6Qw/S0UZoNNGMnaOQyWQCf648I4c2B+tbofZlsdrFju0YZ9A7YsjY4gtUA8ZulmCVFCsNZgY1HAYN00Um98nZ2pjC4IUS0=,iv:+8zt9I51X6+rYiBPzOL5nmtcKNAlENNwAtMnSK+KXuM=,tag:9fF7jtPFCPRHym6HDul/+A==,type:str]",
+		"lastmodified": "2025-09-30T19:48:05Z",
+		"mac": "ENC[AES256_GCM,data:UjuikA/WrnLTF00FOsOOjNPd5dA2EsG9hXUM+016e3cQe+9FtAhSjUSAkeW5qRO5/OHWFm/EyE0fJtfAlOFf7uBA7Dj0uqZnPIZBjV9abn0rQTBv9PjDMsaRMouDojaibOqNsb8KPtbuZehqHm0ETqoZ6TdU3X32Ep+7NJMjET4=,iv:SCc3NIbtAp8rBsWESiMqYAXKi3iQ8y3CShw1H30WgC0=,tag:6oSkVYoJRjcVfdYHd4bnZQ==,type:str]",
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.10.2"
 	}
diff --git a/vars/per-machine/verbena/buildbot/workers-file/machines/verbena b/vars/per-machine/verbena/buildbot/workers-file/machines/verbena
new file mode 120000
index 0000000..e061a4c
--- /dev/null
+++ b/vars/per-machine/verbena/buildbot/workers-file/machines/verbena
@@ -0,0 +1 @@
+../../../../../../sops/machines/verbena
\ No newline at end of file
diff --git a/vars/per-machine/verbena/buildbot/workers-file/secret b/vars/per-machine/verbena/buildbot/workers-file/secret
new file mode 100644
index 0000000..d96390a
--- /dev/null
+++ b/vars/per-machine/verbena/buildbot/workers-file/secret
@@ -0,0 +1,19 @@
+{
+	"data": "ENC[AES256_GCM,data:AFlyIsfX5ROADStXz+k6vJsadQlmh2k9sjOBVwbk1zej0/N17GgOuCibxlbr1XkQfj+CO5HFm/rI2/mocDm5UZLI/vNQCQO31w/roqGCqCYYm8vkUqfHbu/FzJDO0H3BdrRp,iv:HbmncP/TGxnCeCzsUURrPMG+MSPWBRRfo78SK9reCsM=,tag:i6VGbfm2zENtUO4IdvQ3YA==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"recipient": "age1mqnmzn203hyj200psc982ehcedjmcdz8s0ncc50fm9jszjx7rgmqqmppw5",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNSWczaTF1bEJUaHJNdCtv\nRUt6d2cxLzc1a0xjMjQ1QWpYMUY4bXdwc2lJCmtva0pKYWF4U2d3OElxL09iQ2l6\naXZMOHlvQ3NUZUh2dS82bVF6NUhLakkKLS0tIHM2cHM2aTJXK2VnYnBOekNFWEtS\nTlZRYWFadWhXalJpWHEvamR6NXpUa3MK4N6pNJ6lcVFeF0NLA10lGaPrA7xAZeok\ntL9Kf49GJm3So/JQZK0RrdJm3jCG/rDDbFwCq+jLIvbRR/8o9cIhbw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1teege0n8gf9qcheuxtpy7cltf8aczt9ugh8ztp9v4fftn3wwd4jsz0lpeh",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpSVZsd0puWXNMUHd4VktE\nM0xEQkJ6WkQ4NGM5ell3b3BEUUxyY0tLQlVrCmdwUnlVTVZSdTB5Si81RVlqdXFZ\nUUw1bUV0T0Q0VHp3QzZjakUrOFpOK2MKLS0tIFp6QVdwQXZWVXlrUW41YzVSOVBW\nYjQxOFJ1NkhrQjdCa1NRRUExRnZZWEUKSUgPjFMZUjzYh7TOqW/lZR1hys4BEgK/\nFfsB0gOoEC7rfrEzO4Tw2EdOAlKHHy+KihIV5tfZoZ8zdcrsfLsPKw==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2025-09-30T19:48:05Z",
+		"mac": "ENC[AES256_GCM,data:EuFM9l9tjDKaH0V3cFXHDR3IJ+41R9gtTrSpmdh4dqwQjvPqhKVvFztKm0+AUzRkoq8b4CXpFO2AdDY/QBPgfbIWk4ztDcbrgZ8RyR22zITnYchGi1iIOduS84hbOf6nt+XIApXJa5aWE1MBy7xaIDKxbeDxfIzolwQwvlBe2r8=,iv:swLM9NsbfKVG7rgFF0HTP0OVENH/ssqlf2+L/A3nvA8=,tag:049D8wz04WDD+2phrvfT+Q==,type:str]",
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.10.2"
+	}
+}
diff --git a/vars/per-machine/verbena/buildbot/workers-file/users/rpqt b/vars/per-machine/verbena/buildbot/workers-file/users/rpqt
new file mode 120000
index 0000000..c6af5c7
--- /dev/null
+++ b/vars/per-machine/verbena/buildbot/workers-file/users/rpqt
@@ -0,0 +1 @@
+../../../../../../sops/users/rpqt
\ No newline at end of file