diff --git a/hosts/testagent/dev/configuration.nix b/hosts/testagent/dev/configuration.nix
index 073b4613..571abf30 100644
--- a/hosts/testagent/dev/configuration.nix
+++ b/hosts/testagent/dev/configuration.nix
@@ -22,6 +22,7 @@
       user-jrautiola
       user-mariia
       user-maarit
+      user-leivos
       user-hrosten
     ]);
 
diff --git a/hosts/testagent/prod/configuration.nix b/hosts/testagent/prod/configuration.nix
index 18c9f125..09e2259e 100644
--- a/hosts/testagent/prod/configuration.nix
+++ b/hosts/testagent/prod/configuration.nix
@@ -26,6 +26,7 @@
       user-jrautiola
       user-mariia
       user-maarit
+      user-leivos
       user-hrosten
     ]);
 
diff --git a/hosts/testagent/release/configuration.nix b/hosts/testagent/release/configuration.nix
index dda745b5..7aa0ff40 100644
--- a/hosts/testagent/release/configuration.nix
+++ b/hosts/testagent/release/configuration.nix
@@ -22,6 +22,7 @@
       user-jrautiola
       user-mariia
       user-maarit
+      user-leivos
       user-hrosten
     ]);
 
diff --git a/users/default.nix b/users/default.nix
index b2c2dd6e..2ade9baf 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -15,6 +15,7 @@
     user-vjuntunen = import ./vjuntunen.nix;
     user-mariia = import ./mariia.nix;
     user-maarit = import ./maarit.nix;
+    user-leivos = import ./leivos.nix;
     user-vilvo = import ./vilvo.nix;
     user-vunnyso = import ./vunnyso.nix;
     user-bmg = import ./bmg.nix;
diff --git a/users/leivos.nix b/users/leivos.nix
new file mode 100644
index 00000000..d68c9465
--- /dev/null
+++ b/users/leivos.nix
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+{
+  users.users = {
+    leivos = {
+      description = "Samuli Leivo";
+      isNormalUser = true;
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPE/CgI8MXyHiiUyt7BXWjQG1pb25b4N3als/dKKPZyD"
+      ];
+      extraGroups = [
+        "networkmanager"
+        "wheel"
+        "dialout"
+        "tty"
+      ];
+    };
+  };
+}