diff --git a/roles/builder/keys/flokli b/roles/builder/keys/flokli
new file mode 100644
index 0000000..ece687d
--- /dev/null
+++ b/roles/builder/keys/flokli
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTVTXOutUZZjXLB0lUSgeKcSY/8mxKkC0ingGK1whD2 flokli
diff --git a/roles/builder/keys/lewo b/roles/builder/keys/lewo
new file mode 100644
index 0000000..967c097
--- /dev/null
+++ b/roles/builder/keys/lewo
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1e1EG5LUckzjoUiwJZ3ubpKkVN4LmWX5L4rrFimopTdERRM+CU/R7lGpr/msSUNEwMl+5pS/61NS/O7jMOWstVIIdt/ylaY0k71UvrHtdb0YsGPiNx+4+uhavrAmrKaC0wz1rLppqFyzoLxhb6neGrC7zPPHlOvubAVAy73zCL3eDNWuawGoD2mMygSwL1JsaHAxI5fjNA7tyvQIqEfkVki+kWtgZ/0ic19DbtuvFQdECubK3z/IlG1xhKN8Lb2/d9YNI71CMjT0bGYM3qLchmU4WwciLfTBQTqSplNfeIwXMpGvoEl5wbgs1XOXd7wRVlbAE1vb3m6a+e/6gHQ9t
diff --git a/roles/builder/users.nix b/roles/builder/users.nix
index a740d66..bc28a6c 100644
--- a/roles/builder/users.nix
+++ b/roles/builder/users.nix
@@ -27,11 +27,21 @@ let
       keys = ./keys/fgaz;
     };
 
+    flokli = {
+      trusted = true;
+      keys = ./keys/flokli;
+    };
+
     jtojnar = {
       trusted = true;
       keys = ./keys/jtojnar;
     };
 
+    lewo = {
+      trusted = true;
+      keys = ./keys/lewo;
+    };
+
     raitobezarius = {
       trusted = true;
       keys = ./keys/raitobezarius;
diff --git a/users/flokli.nix b/users/flokli.nix
deleted file mode 100644
index 86659bb..0000000
--- a/users/flokli.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ lib, ... }:
-let
-  userLib = import ./lib.nix { inherit lib; };
-  keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTVTXOutUZZjXLB0lUSgeKcSY/8mxKkC0ingGK1whD2 flokli"
-  ];
-in
-{
-  users.users.flokli = {
-    openssh.authorizedKeys.keys = keys;
-    useDefaultShell = true;
-    isNormalUser = true;
-    extraGroups = [
-      "wheel"
-      "trusted"
-    ];
-    uid = userLib.mkUid "flok";
-  };
-}
diff --git a/users/lewo.nix b/users/lewo.nix
deleted file mode 100644
index b909ccb..0000000
--- a/users/lewo.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ lib, ... }:
-let
-  userLib = import ./lib.nix { inherit lib; };
-  keys = [
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1e1EG5LUckzjoUiwJZ3ubpKkVN4LmWX5L4rrFimopTdERRM+CU/R7lGpr/msSUNEwMl+5pS/61NS/O7jMOWstVIIdt/ylaY0k71UvrHtdb0YsGPiNx+4+uhavrAmrKaC0wz1rLppqFyzoLxhb6neGrC7zPPHlOvubAVAy73zCL3eDNWuawGoD2mMygSwL1JsaHAxI5fjNA7tyvQIqEfkVki+kWtgZ/0ic19DbtuvFQdECubK3z/IlG1xhKN8Lb2/d9YNI71CMjT0bGYM3qLchmU4WwciLfTBQTqSplNfeIwXMpGvoEl5wbgs1XOXd7wRVlbAE1vb3m6a+e/6gHQ9t"
-  ];
-in
-{
-  users.users.lewo = {
-    openssh.authorizedKeys.keys = keys;
-    useDefaultShell = true;
-    isNormalUser = true;
-    extraGroups = [
-      "wheel"
-      "trusted"
-    ];
-    uid = userLib.mkUid "lewo";
-  };
-}