NixOS · Mic92 · Jun 20, 2026 · Jun 19, 2026 · Jun 19, 2026 · Jun 19, 2026
@@ -49,7 +49,7 @@ D("ofborg.org",
 	A("build04", "185.119.168.13"),
 
 	A("build05", "142.132.171.106"),
-	AAAA("build05", "2a01:4f8:1c1b:6d41::"),
+	AAAA("build05", "2a01:4f8:1c1b:6d41::1"),
 
 	A("eval01", "95.217.15.9"),
 	AAAA("eval01", "2a01:4f9:c012:cf00::1"),
@@ -61,7 +61,7 @@ D("ofborg.org",
 	AAAA("eval03", "2a01:4f9:c012:e37b::1"),
 
 	A("eval04", "95.217.18.12"),
-	AAAA("eval04", "2a01:4f9:c012:273b::"),
+	AAAA("eval04", "2a01:4f9:c012:273b::1"),
 
 	// nixos-foundation-macstadium-44911305
 	A("mac01", "208.83.1.173"),

diff --git a/flake.lock b/flake.lock
@@ -7,8 +7,8 @@ keys:
   - &nixos-foundation-macstadium-44911305-ofborg-org age1x608lllmu7gdfjnn6c8mvmmguft5f22fu7g38wv3ckmzqy2usq0q5u2ekx
   - &nixos-foundation-macstadium-44911362-ofborg-org age1d0u5ukkwsf47x4jv6uklcc4j3ljnmyz879syya2qneagz0t42cqqyf09dt
   - &nixos-foundation-macstadium-44911507-ofborg-org age1s0m24l3s29jr345uxk5j8zq7kd4sln3rvf0pdtd6afum3smtxsyqtjra0z
-  - &nixos-foundation-macstadium-44911207-ofborg-org age1f6u77gvh94fk5fdh53lp04nk87cvjmwy2q3hjdlhd83mhlp0jg0s7rupux
-  - &nixos-foundation-macstadium-44911104-ofborg-org age14gkxeqaehj2m38sesnc6fyd4c3hqjt7tqjz6q7lrult3uaahxcysdxt67n
+  - &nixos-foundation-macstadium-44911207-ofborg-org age1dm7t44v3jh3uht7rjv4jqqk5zxh9ltgw37q3z8r2s5hudqp7qcrqa0eqj6
+  - &nixos-foundation-macstadium-44911104-ofborg-org age1wuydxhl0k8zh8nqejp8sqsy4waal6fcj2q72u53cptcd69v6vcms9s4cqs
 
 creation_rules:
   - path_regex: secrets/nixos-foundation-macstadium-44911305.yml

@@ -8,15 +8,22 @@
 {
   imports = [
     inputs.hydra.darwinModules.builder
+    ../../non-critical-infra/modules/hydra/staging-cache.nix
   ];
 
   services.hydra-queue-builder-dev = {
     enable = true;
     queueRunnerAddr = "https://queue-runner.staging-hydra.nixos.org";
     maxJobs = 2;
     mtls = {
-      serverRootCaCertPath = ../non-critical-infra/hosts/staging-hydra/ca.crt;
-      clientCertPath = "${../ofborg-ca/client-${config.networking.hostName}.crt}";
+      serverRootCaCertPath = builtins.path {
+        path = ../../non-critical-infra/hosts/staging-hydra/ca.crt;
+        name = "staging-hydra-ca.crt";
+      };
+      clientCertPath = builtins.path {
+        path = ../ofborg-ca/client-${config.networking.hostName}.crt;
+        name = "client-${config.networking.hostName}.crt";
+      };
       clientKeyPath = config.sops.secrets."queue-runner-client.key".path;
       domainName = "queue-runner.staging-hydra.nixos.org";
     };

@@ -5,56 +5,56 @@ sops:
   age:
     - enc: |
         -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByZHFSSjZXTm5IdlZ1TlhH
-        Z09OM0lVOXhjME1xVjlXc3Q1RUFMa0syRlQ0Cm1WZWdqcVBGZ0R0WVZBTGFRWGRn
-        cGVXdi9uNVpNalRXdENWK0VOM21rZFUKLS0tIEZuaTJ1c2VHOWROZlE1UndLVGlw
-        bUUvSG5IZzNianFVNFR4eXROM29jajQKtD0Qu34Dy2DXkCI+sqUuMtcVqJKUmj4k
-        PqqxKrL2OnB6HL9ufzTTw4kDIbVYFoHYHaJfMNNvf0RkgkQ8GjhHAw==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1aHFBaUowSSsvbjVTKzRv
+        WHdNTDdybUdjbW1TaEUrQWUrV1lwaUV4QVNvCnZZWXJkd0pGMTJlL3lETkNqU21p
+        ZTNEYTkwbTQ3SDY1WDRrb0RXMWpGVk0KLS0tIGhCbFBGSVhGbEFGVXdHSXNJTG1R
+        S0E1ZEVpQjl4WGN5REdiVVRNdjVCeTQK3Vxd+5VVq6DfqNaDVAECHMc/ZXhS7BK2
+        Dymwg+6KbYBZIGyCkhYoReQd6sLVX8CrRJP4seM9VwT4dgOpV8z6ng==
         -----END AGE ENCRYPTED FILE-----
-      recipient: age14gkxeqaehj2m38sesnc6fyd4c3hqjt7tqjz6q7lrult3uaahxcysdxt67n
+      recipient: age1wuydxhl0k8zh8nqejp8sqsy4waal6fcj2q72u53cptcd69v6vcms9s4cqs
     - enc: |
         -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtQ281YWxMMEFLNnZjSU5U
-        Vlh3RkpWV3lwU0hRbjFXUUJQMWpzUXM2azFZCnhSVVdrYWlmUkU2eHlSV1NrVGlr
-        Y1pReFRWWUQ4bTFYYTZCYjJnVGprcVkKLS0tIFVidHRpelpaUUhqcWY1ZWFHZXJT
-        SytMYklGaEE3V2l1V0VxTUVmdlFNMmcKid9JDK1cp63M4TTmiREHS/O9QYDj2B1w
-        iUJ5iRlYKUxQdRCgMLwbFPmbCxfMEshZF1Rg7QSA22sEFk8NJ14Xdg==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArMkozT0RjNStzc3JoUGZn
+        dk9WSSt4QlNxd1RlMnppOXFidWJQdXk4b3hVCmQ3MDZtNWxRcy9UbEY5L3V4U3VL
+        Ung4NmdPTmFINHJLS1ZvaUI1N0ZuN1EKLS0tICtFMzRHVkFwN1l1b1FMKzlpQ1VI
+        eWNTRVpZRGRoMXA3RkZ3SUVpUWkvMDAKM1iEN9KyzIMvs/DILj0vclotC1ZGbcCi
+        jSlQcHCsaCfocZ/GNTxiOmedavjsnMu9va4OE+2tYlkZChu8IU54Pg==
         -----END AGE ENCRYPTED FILE-----
       recipient: age1j3mkgedmeru63vwww6m44zfw09tg8yw6xdzstaq7ejfkvgcau40qwakm8x
     - enc: |
         -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4ajRtK09qNjZCanRGekZM
-        ME45aW5Oa3I2clFjQ3YrS2F1WFYrVGI4RlJnCi8rTjdmTXBwNUZoMU50bHBha1dx
-        K3FFZVhwalF3ZkpsMmZiS281NXJiczgKLS0tIE1VUWZEM3VKb3RIbUdLMEUwQUQr
-        N0VJQjJlZithdVkrRy9ybThZMHFrVHcK4wFAGM3N7pzZKGUllAx0crykAW4z6+x0
-        lyYcgUn1zKt8s7o981L6RGsmfffDYvHZY2m1GLcpcUy8ofd6cACwcw==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsd0R4U2xTOGdWU2JSTWIr
+        YllWKzNrNkFaUy9wTTVRb0tCT0ozbW1wb2dnCkZXQWJzQUg4NW1JK2lrbkNWaWtF
+        QTdVcG5jbnI4Y29ZbVVSY210NEFOa2cKLS0tIENEMGRnZ2o2R1pjQ3BtVlZScDB5
+        MlR3Ly81WDNjRWl0Wit5TGI0Z2FEUkUK6WUI/2ySrgmSzNLspPZUp5DorSMaOkJx
+        ww4Z1Pl7CLwsrwr9XsNMFodHA+bM8HpIpY959SBJ7n8PZazjzwbGwQ==
         -----END AGE ENCRYPTED FILE-----
       recipient: age17ez23w2kpxl0gcdx4ehcglkcfcfnv4qz0gq2n8ylxwx4yrtjpvjqxfasua
     - enc: |
         -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQUkN2YWhybXh1QUpwZGNJ
-        QVYxMllSS3cyTTVybXRQNXN2QTlOeUprREdFCnNlQjA0SWpuVkRUZ2VRUEhBdThn
-        ZlhYTEkzcmtGYVAwK04zSk53eXpQMEkKLS0tIHY1OGo2bWVxYndIclg3YnpOZEly
-        OUNBcTFlRVh3ZFhMckZPSGdzRFo2ejgKPxGZyivSFMlzUliadHbp2eDGz6s8u8nt
-        O8YXvQNktyyzWYtNwAaJ8eJghEDu1JbLJQI0uIw5ah38sklnem+X1g==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvby9LSEJndlNCSlQxRTVC
+        NGZmZENPMzFiQTRDQ3MvMWpoTzMzZEU3UFVvCndLMENKNnM5QnZ2d1R6NzZQNFNs
+        U1JFM3pNZ0p3SERzYjl4dUNERmpZSmMKLS0tIFU1TDV3VFc2N3dBWXZWRzd2S3Zt
+        ejNiUm0xeDhrclgrK3dCY2RtaXFoeDAKWGpL5Rr0NW2VXrkMbY01n4b6sIoq839H
+        rGESCoe1TS7Yer2o6MEa9/6Pq5yue+iQOb2VUuHyCXFj4++8JzhOCg==
         -----END AGE ENCRYPTED FILE-----
       recipient: age1lz3mvem0rgfxj7uavth8du4xsw23wp5ts77m5vvclxyj5mjxfujs0jgtcz
     - enc: |
         -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBydUR2MHBQSmRkbTkzRUpG
-        QmJ4SVVMUFRkdGVhTVpQUXQ0Q3Q1dVQ4alVvCmxXeGx1SEVVdDRKKzJWdUhzajZv
-        SEpLMXhQb09nSzk4QU1pUXZBakhqTFUKLS0tIEdlWk9ERUg1eXRndzlxVjQxNzdM
-        OXI2Q0Jya0Z2T1o3bkxNRWYzRU5Wc0kKPjik9Qua8/aKXv3krYtobNsH9Tm99fBp
-        ml39IC0sL4yv1TukBf4L82GmXvsOLqLCuw9XgQOQTtCoPerzF0jvzA==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEUk1MbTVTVXB2Vk5ZeTRr
+        a1VpNHYxNWdrSUh1dFFpYnd0Z0tibmJhMFZzCmVkM3MyR21KYUxaOFVGNndxUW1w
+        cHE1SXJpakpteUVaL3BUNExFcngrRnMKLS0tIFM4OWpSUFhka0YzVHI5dE9VQXFG
+        eVAvdnVtTTBZeXhWTFpMK2lvQTJ4UncKaegVh7KsaXEmK8VBYZseCK54pDhOTb/e
+        FGtHSR81QDhsNDhamHuuz8dC8sspW899+H0yr+muzKtaw7XafwFmKg==
         -----END AGE ENCRYPTED FILE-----
       recipient: age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz
     - enc: |
         -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZdVRLUHg4ZUZjQWxxTS9q
-        UkVkc2w4OG93dUVYZVBZVXhRYU1kWTdSR1hnCjhLem5jVFh2bU13NVNMS3ZpQ3pN
-        enpKRDJpSVllaVFTVzliSjg1RFY2RXcKLS0tIDFubWlFNmVqUmtoOW9tRC9CeDFk
-        QTVNSkZHNWJIZmFVRjg0ZDZIa09YdkkK+MOVzW30GiabKfgO/QyqBwKXKqjEPvFF
-        L1BN4N3xSDw5hLROi9CY+GkomFPhSatXg/V5vv6/7OPlNYIrdYZ12g==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVUkdzQmZPVlVxQm1HQWtV
+        c2xmT2l2Z2wwbyt3amhzNlpxTGY4NXY5NDFNCnJMWWF4Uk5EeFRiYnVPZDlQZk83
+        UnNTbXI2bDF5QnJydE1UdkJpTlA2WTAKLS0tIDBKajczWGY0Umx1alBHWnIyVTFZ
+        SHZqYzFRZ3B6WExQS1J5NjVoR0pGcWsKVBAaTSLZPkEGgghblmw5aI6Mc3+W1Bt/
+        LSW5f7mYv+naQfQEgKApJjridS9p+J+yhgK8xAkWS+t+EpembZLKlA==
         -----END AGE ENCRYPTED FILE-----
       recipient: age1nnm255ah9wa4gpsaq0v023a75lnmlcxszt9lc6az3mtwzxgrucfq45rp7h
   lastmodified: "2025-08-31T15:04:36Z"

@@ -5,56 +5,56 @@ sops:
   age:
     - enc: |
         -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5NmlaTGlTelQ4SjkxRVVC
-        dGhQRjJHQzFRWmZyR3IxTVZINzJqYTc4dWlZCmNLS1JkdHh0MzJpdWRYd2g4Tllp
-        dGlCMytPQ0swNlA4WXA3L1R6d3VGYTQKLS0tIGNxemc1MTFXMExGd2ltbFJDOUtL
-        TDVTNUVZN2VQSVVkV3liZ1c2WUExZjQKc4/3C6tQbGAl6odnxTFn2GN51IKXDrM3
-        yDAzfQdn/cekEXft+rEPK+GlREmcCNTdGUsNPYwDbnQij4FlfKv4aw==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmUjhIdUlvMjF1S0ZYeWFj
+        L2szSGh6QzVHUVNIMHhTQ2I5d1l1T21rMUEwCkJpQldJbm83dW9wSVZkcU0xM3Qr
+        bWNRSC9Rci9BODhtMDdUUFoxZ1RUZzgKLS0tIG5TczdDSlJkWVhqVS93NjJuZ2Vt
+        Rk1CRVJmak9oTGczRllEcnl2MFNSd3MKpEE0r3VtlCyGj/2mfXxSw6mP2VChK+Bo
+        Z1vKR4SVPuTssYI7XwKaOT1avuP18hF4dwP7wPslhgOABmirLDbF8Q==
         -----END AGE ENCRYPTED FILE-----
-      recipient: age1f6u77gvh94fk5fdh53lp04nk87cvjmwy2q3hjdlhd83mhlp0jg0s7rupux
+      recipient: age1dm7t44v3jh3uht7rjv4jqqk5zxh9ltgw37q3z8r2s5hudqp7qcrqa0eqj6
     - enc: |
         -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIT29qZzhDYU1hYUtBRzVL
-        K2RMQWtRNDVKVG94Y0xkcjIzUWN3UXpWTEQwCis3Vi9vMzF3S1ZUaTNLVmxzWkpC
-        Rk9NNGNtWS9pTmU5ZDhsbXMxYWZraUUKLS0tIEwyb2t0dkVMU2FYODZEdUZ0ZVBt
-        YSs5MFU5Z1Q5YnBQWWFNRmlTM2xXZDQK1Uqeb0LOrX3Gu/X2X5LOM3CL5Nn8xwsu
-        y4Unjn0XdAvlJcqrORnKrRr5UJHAz0k1EELU40UT5xot3fmpw0lpzQ==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCNHMwQWoxbVl5a2hGekhR
+        aFdNN1NPaThRaGN4c0Ird1A5bnZ6TWh4WHpFClpQWUg4YXFWczN5V2dRTTBZSldx
+        b1Jwczhkcy9BL2pjVVJweStPakN5L2cKLS0tIGpMaW1QZmEyTmV3RG9mbmJNeElI
+        bVA5M251L01RNVZvem5ueEV4OXl5SXcK/cGrU6smZ0ZfomUkA2iuadnepdjrp2Bm
+        im/Bar3OK04kA1+8RoUO9e+FBw+w1HF3mvtX2AjAUD6bW39Kvt7qGw==
         -----END AGE ENCRYPTED FILE-----
       recipient: age1j3mkgedmeru63vwww6m44zfw09tg8yw6xdzstaq7ejfkvgcau40qwakm8x
     - enc: |
         -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5bTBiZHdreHVWV3pDWkZW
-        Y3pLU3R4amF5Vko0SnJROFNMNWllVWZabFd3CnJnQmdnS1BjeHVaT0dkZXNsVC8y
-        c2RZcWRzek1NUnhOd3FHNUZNSTJVVE0KLS0tIHo0ZnN6bmQ1OFh2SzZpeVdlSmpW
-        L1RqclR1dXVNSG5FWkpEeWNmQ1lYaGcKKhiaTArVKNjfMwrxl1AXOeVPxeHDUPk3
-        E8hn0rUFA6iTk3KAkyr1e0tGwsR6aSR8yg/5ciNVPTawq5QUnELeew==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6T2ZSalA1WlJ3alU3WlVI
+        eFU0Zy8zNDd2U2hmZ2JhY1MvR3JGTXZnNVR3CkhTaThJYXQrb1RlVy9NN2pFY2Nk
+        TllpeDlCWU9lWnMzV0R1TmpWUUxuZTQKLS0tIDd2YjN1YXRXNDR5akVCaVhFbk5n
+        aWZya3VnMm1udUkwdGZLVENtQnJyMEkKmtngRatzTcIRvxFRkCoRa8x+gBftPcXk
+        206GpIet/Wt86mJ83HWJv+ijvp4A1FX1C7a4MbQh44/2LyNMJ64+hw==
         -----END AGE ENCRYPTED FILE-----
       recipient: age17ez23w2kpxl0gcdx4ehcglkcfcfnv4qz0gq2n8ylxwx4yrtjpvjqxfasua
     - enc: |
         -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiVnF3eWJ6azJxSGY2V3c4
-        enBOdjlMRWdPaTQ1dHU1T1VDcHYvOTdUcTFFCkpVYU5QWDk1TUY5cmdLNERkSm1Z
-        SGwrNTFmUnpsWWtRRUlZQWppb0VhUG8KLS0tIEJUQmdTNlhhOXJONjFoZHZBOVVG
-        RTlZRC82Z2VxTndsdXFmTzdkdVduZXMKCQvMkhV+AHmX0BTcOpuBlvRhnhqVBu0y
-        BowxQIrYhxnq9LQmciluK68+jImaI7Zu0LdDLgvALlJZDoqTzyO+qA==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5TkdzdjdvT0hnbUdRZERn
+        cm5WS2pnK0Q1TVJlQWJ1MkRrL2xSTFd5RWpzClJLcTMyb3J1VWRuZ2R1QzVzTlpE
+        NFZDTzBlT0NMbVB1K3lNNzZjMXhQNlUKLS0tIEFtVEQ0ODY5dHRLekVja3dJVk5F
+        RmRIMHM1WE9pa1pxaEVKakJ6N3JhQzAKjr0f6dsn/hVrXHYQ4S0+pzH5fUpSYPL/
+        Typ98HWNKbGq0xamX5YoAo8AlIyLRxpGvZO5smpyekERVssdKZBY/A==
         -----END AGE ENCRYPTED FILE-----
       recipient: age1lz3mvem0rgfxj7uavth8du4xsw23wp5ts77m5vvclxyj5mjxfujs0jgtcz
     - enc: |
         -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvcldkSUJHR1VnQmpZN2dP
-        Z2FpRi9HVVkrM0lmZE0vYmc5NGFhOUl1SGhzClA0b3RtU1pVTHh3cFI4ZisyYjky
-        d1BqYnd3QzM1WUpuSGFBVVRvSVdaUlUKLS0tIDBPMDVpRVlxVEU4eWlITllPV251
-        b2l2K0Q0NzFpQjNnWXZpeHlvaDdMRFkKCYNprhnU+Bt/YYl1CEEItrl7Sugmv8zD
-        SeT7kOrvVihxrFMpr88mlt0WkAgekByxxjAH1CjEtHJgTZ5h4Sk/jg==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzVlFCakN1dzhwQlpVb3pl
+        aUlUYmpWTXY1eWFzeWVWQ1NVbG9PYy8veVRNClJyWnpHUWd1L3NYZWQwUk5zNHVw
+        UE9jalpObVVyVzU4VjRHa0ovRDhtbzgKLS0tIGZtTlZ0cTQrS0xzU0VRdE9TVDdt
+        Szg5eG9LT1ZIQjh5QnlwMytldHFyclkKW7nqDTqbGT4JA9ldDUnpngo4fA6vYs0T
+        K2KnsCIrjiG6F+T2Ac10H+6Fbd+T0ubqoSvJqvvxZLDjy/S2D3WwtA==
         -----END AGE ENCRYPTED FILE-----
       recipient: age17n64ahe3wesh8l8lj0zylf4nljdmqn28hvqns2g7hgm9mdkhlsvsjuvkxz
     - enc: |
         -----BEGIN AGE ENCRYPTED FILE-----
-        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBudVdYQjRkUlhWb3hkTm92
-        aThpZVB5MnJNQVFPYkZiVG9TOTZpTUpmSFcwCkpzVmcraDJ3YUVTNVRiM0ZxVXZM
-        L2tPUEJxeVpaOEF0bjl3NmZ3cGo2YWsKLS0tIElRUzNpZXJkMUFINjJvK25SUGdB
-        ZnVnRm8yRG8yZmVIRDNMM2FIZGNGUzQKubUus1TokoZTi6E4m5Pc7cMNt56a1AkP
-        7PXJQ/8kqVVl2u6sdANDTj/HUHr/fVuU75o+rnyZffm0Dq7SLGy8zA==
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3VnpSNTZ5QXBiR0NXUEFk
+        eVk2RHdEbkFuVjJrakhUc21GTVRpNENRdlFBClNpUVc5WmxiUXR6KytBVDQvY1lR
+        aGtWY0V3U2JnWHJsMGJEdmdQVnJMaHcKLS0tIExpeExidzMvemRKRWxpU3Nvc1pl
+        VlU2dDdjS3JYcmtVWlNJRnJLRTJ4MWsKC46HZtR86iVwkq/Kkiku/ITKFc7Rn1ep
+        Pdsrtt5BjF1xxAxaMr9bdcM367nYU7phTc6eqs31BPEOjTaj/ONCvw==
         -----END AGE ENCRYPTED FILE-----
       recipient: age1nnm255ah9wa4gpsaq0v023a75lnmlcxszt9lc6az3mtwzxgrucfq45rp7h
   lastmodified: "2025-08-31T15:04:59Z"

diff --git a/non-critical-infra/flake-module.nix b/non-critical-infra/flake-module.nix
@@ -7,7 +7,7 @@
   colmena.hosts = {
     caliban = { };
     umbriel = { };
-    staging-hydra = { };
+    staging-hydra.targetHost = "staging-hydra.nixos.org";
 
     # ofborg
     "core01.ofborg.org".targetHost = "core01.ofborg.org";

diff --git a/non-critical-infra/hosts/build05.ofborg.org/default.nix b/non-critical-infra/hosts/build05.ofborg.org/default.nix
@@ -22,7 +22,7 @@
     matchConfig.MACAddress = "96:00:03:fd:32:fd";
     address = [
       "142.132.171.106/32"
-      "2a01:4f8:1c1b:6d41::/64"
+      "2a01:4f8:1c1b:6d41::1/64"
     ];
     routes = [
       { Gateway = "fe80::1"; }

diff --git a/non-critical-infra/hosts/eval04.ofborg.org/default.nix b/non-critical-infra/hosts/eval04.ofborg.org/default.nix
@@ -23,7 +23,7 @@
     matchConfig.MACAddress = "96:00:03:f4:25:eb";
     address = [
       "95.217.18.12/32"
-      "2a01:4f9:c012:273b::/64"
+      "2a01:4f9:c012:273b::1/64"
     ];
     routes = [
       { Gateway = "fe80::1"; }

diff --git a/non-critical-infra/hosts/staging-hydra/hydra.nix b/non-critical-infra/hosts/staging-hydra/hydra.nix
@@ -126,6 +126,8 @@ in
         remoteStoreAddr = [
           "s3://nix-cache-staging?secret-key=${config.sops.secrets.signing-key.path}&ls-compression=br&log-compression=br"
         ];
+        usePresignedUploads = true;
+        forcedSubstituters = [ "https://cache-staging.nixos.org" ];
       };
     };
 

diff --git a/non-critical-infra/modules/hydra/builder.nix b/non-critical-infra/modules/hydra/builder.nix
@@ -15,6 +15,7 @@ in
 {
   imports = [
     inputs.hydra.nixosModules.builder
+    ./staging-cache.nix
   ];
 
   services.hydra-queue-builder-dev = {

diff --git a/non-critical-infra/modules/hydra/staging-cache.nix b/non-critical-infra/modules/hydra/staging-cache.nix
@@ -0,0 +1,10 @@
+{
+  # Substituter the staging queue runner forces builders onto for presigned
+  # uploads (services.hydra-queue-runner-dev.settings.forcedSubstituters).
+  nix.settings = {
+    extra-substituters = [ "https://cache-staging.nixos.org" ];
+    extra-trusted-public-keys = [
+      "staging-hydra.nixos.org:XTeS2S4YgmVOVVTBazog3M6pSHoUKw0k5mCcqdmPeCU="
+    ];
+  };
+}