diff --git a/hosts/flora-6/caddy.nix b/hosts/flora-6/caddy.nix
index 03bea7e9..cd90d4ef 100644
--- a/hosts/flora-6/caddy.nix
+++ b/hosts/flora-6/caddy.nix
@@ -7,6 +7,7 @@
 }: {
   services.caddy = {
     enable = lib.mkForce true;
+    group = "hakkonaut";
     email = "admins@pub.solar";
     globalConfig = lib.mkForce "";
     virtualHosts = {
diff --git a/hosts/flora-6/flora-6.nix b/hosts/flora-6/flora-6.nix
index 5f324077..f25f89dc 100644
--- a/hosts/flora-6/flora-6.nix
+++ b/hosts/flora-6/flora-6.nix
@@ -55,13 +55,17 @@ in {
       }
     ];
 
+    # Machine user for CI pipelines
     users.users.hakkonaut = {
       description = "CI and automation user";
       home = "/var/nix/iso-cache";
       useDefaultShell = true;
-      uid = 995;
+      uid = 998;
       group = "hakkonaut";
       isSystemUser = true;
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGP5MvCwNRtCcP1pSDrn0XZTNlpOqYnjHDm9/OI4hECW hakkonaut@flora-6"
+      ];
     };
 
     users.groups.hakkonaut = {};