diff --git a/hosts/binarycache/configuration.nix b/hosts/binarycache/configuration.nix
index 46df0757..2269acbe 100644
--- a/hosts/binarycache/configuration.nix
+++ b/hosts/binarycache/configuration.nix
@@ -28,6 +28,7 @@
       user-jrautiola
       user-cazfi
       user-hydra
+      user-tervis
     ])
     ./disk-config.nix
   ];
diff --git a/hosts/ficolobuild/configuration.nix b/hosts/ficolobuild/configuration.nix
index c10b9de5..e8ef4a98 100644
--- a/hosts/ficolobuild/configuration.nix
+++ b/hosts/ficolobuild/configuration.nix
@@ -20,6 +20,7 @@
       user-jrautiola
       user-mkaapu
       user-themisto
+      user-tervis
     ])
     ./disk-config.nix
   ];
diff --git a/hosts/ghafhydra/configuration.nix b/hosts/ghafhydra/configuration.nix
index bbdb2e9d..79b9e47a 100644
--- a/hosts/ghafhydra/configuration.nix
+++ b/hosts/ghafhydra/configuration.nix
@@ -30,6 +30,7 @@
       service-nginx
       user-bmg
       user-hrosten
+      user-tervis
     ])
   ];
 
diff --git a/hosts/monitoring/configuration.nix b/hosts/monitoring/configuration.nix
index 569af5ac..81499e66 100644
--- a/hosts/monitoring/configuration.nix
+++ b/hosts/monitoring/configuration.nix
@@ -30,6 +30,7 @@ in {
       service-nginx
       service-node-exporter
       user-jrautiola
+      user-tervis
     ])
     ./disk-config.nix
   ];
diff --git a/hosts/prbuilder/configuration.nix b/hosts/prbuilder/configuration.nix
index 8abb1b52..86c76878 100644
--- a/hosts/prbuilder/configuration.nix
+++ b/hosts/prbuilder/configuration.nix
@@ -20,6 +20,7 @@
       user-jrautiola
       user-cazfi
       user-karim
+      user-tervis
     ])
     ./disk-config.nix
   ];
diff --git a/users/default.nix b/users/default.nix
index eb5872fd..6295758a 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -13,5 +13,6 @@
     user-mkaapu = import ./mkaapu.nix;
     user-karim = import ./karim.nix;
     user-themisto = import ./themisto.nix;
+    user-tervis = import ./tervis.nix;
   };
 }
diff --git a/users/tervis.nix b/users/tervis.nix
new file mode 100644
index 00000000..421bddf7
--- /dev/null
+++ b/users/tervis.nix
@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
+# SPDX-License-Identifier: Apache-2.0
+{
+  users.users = {
+    tervis = {
+      isNormalUser = true;
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDJau0tg0qHhqFVarjNOJLi+ekSZNNqxal4iRD/pwM5W tervis@tervis-thinkpad"
+      ];
+      extraGroups = ["wheel" "networkmanager" "docker"];
+    };
+  };
+}