diff --git a/hosts/ficolobuild/build3.nix b/hosts/ficolobuild/build3.nix
index d437ea6e..2d55c81a 100644
--- a/hosts/ficolobuild/build3.nix
+++ b/hosts/ficolobuild/build3.nix
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2024 Technology Innovation Institute (TII)
-# SPDX-License-Identifier: Apache-2.0
 #
+# SPDX-License-Identifier: Apache-2.0
 {
   self,
   lib,
@@ -9,10 +9,9 @@
   imports = lib.flatten [
     (with self.nixosModules; [
       user-themisto
-      user-barna
-      user-bmg
     ])
     ./builder.nix
+    ./developers.nix
   ];
 
   # build3 specific configuration
@@ -21,6 +20,6 @@
 
   # Trust Themisto Hydra user
   nix.settings = {
-    trusted-users = ["root" "themisto" "barna" "bmg"];
+    trusted-users = ["root" "themisto"];
   };
 }
diff --git a/hosts/ficolobuild/build4.nix b/hosts/ficolobuild/build4.nix
index 40a57bd3..de9829c6 100644
--- a/hosts/ficolobuild/build4.nix
+++ b/hosts/ficolobuild/build4.nix
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2024 Technology Innovation Institute (TII)
-# SPDX-License-Identifier: Apache-2.0
 #
+# SPDX-License-Identifier: Apache-2.0
 {
   self,
   lib,
@@ -10,7 +10,6 @@
     (with self.nixosModules; [
       user-themisto
     ])
-    # Import Ficolo x86 builder specific configuration
     ./builder.nix
   ];
 
diff --git a/hosts/ficolobuild/builder.nix b/hosts/ficolobuild/builder.nix
index 637ae966..fe3f1458 100644
--- a/hosts/ficolobuild/builder.nix
+++ b/hosts/ficolobuild/builder.nix
@@ -1,6 +1,6 @@
 # SPDX-FileCopyrightText: 2023-2024 Technology Innovation Institute (TII)
-# SPDX-License-Identifier: Apache-2.0
 #
+# SPDX-License-Identifier: Apache-2.0
 {
   self,
   config,
diff --git a/hosts/ficolobuild/developers.nix b/hosts/ficolobuild/developers.nix
new file mode 100644
index 00000000..259de7a8
--- /dev/null
+++ b/hosts/ficolobuild/developers.nix
@@ -0,0 +1,46 @@
+# SPDX-FileCopyrightText: 2024 Technology Innovation Institute (TII)
+#
+# SPDX-License-Identifier: Apache-2.0
+{lib, ...}: let
+  groupName = "developers";
+
+  # add new developers here
+  developers = [
+    {
+      name = "barna";
+      keys = [
+        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQChDMYWXg51H1/3Y3fGb8Bn6Dj1jauzKKsPdtRjFHTWSCde4GmF1/uPUJ9qogLNBS2B0nDS+IxnNNIKWarZhkb1aHvWHBy1n1s4gULwCZcF36yaFfKKCIfro+YI1/1uOZuv/AtVLzAgFlgUb21xLF9m11yuobB6OqSd9Fxt8i2AdfwVuj1fxyRlI+l5v82g0d3KiN0Pw+FqtzIZ6sEcpw8Mqn469PIDARUmYxo7mRMug8QPmQPgv57YhbppLN6cHUbYlud/2UeESUFsXrCAMDLtghvkNlAlmriaqhlVoH3jTLJ8ljIbHeFrBidZZk1/e7Ucw8iLkesQ11YrAY0QqqyH6vRr/o0XHiCbnxJl7rH9AC8tguqgFR/K2T8qygJZfs1szaOQg/+O7tdqwU8+j2NDSuh+PjYGnMOIT11ErtAYB2DAd8xVYOOWCsLeHVoiC1jgkVjehkV4wmwmq3d7X5iyuK7n4zJTEIqDzbrfshUnpL9ERe7zlFaocqUVedn1DDU= barna.bakos@unikie.com"
+      ];
+    }
+    {
+      name = "bmg";
+      keys = [
+        "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIEJ9ewKwo5FLj6zE30KnTn8+nw7aKdei9SeTwaAeRdJDAAAABHNzaDo="
+        "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIA/pwHnzGNM+ZU4lANGROTRe2ZHbes7cnZn72Oeun/MCAAAABHNzaDo="
+      ];
+    }
+  ];
+in {
+  users = {
+    groups."${groupName}" = {};
+
+    users = builtins.listToAttrs (
+      map (
+        {
+          name,
+          keys,
+        }:
+          lib.nameValuePair name {
+            inherit name;
+
+            openssh.authorizedKeys.keys = keys;
+
+            isNormalUser = true;
+            extraGroups = [groupName];
+          }
+      )
+      developers
+    );
+  };
+  nix.settings.trusted-users = ["@${groupName}"];
+}
diff --git a/hosts/ghafhydra/configuration.nix b/hosts/ghafhydra/configuration.nix
index 79b9e47a..42dd9176 100644
--- a/hosts/ghafhydra/configuration.nix
+++ b/hosts/ghafhydra/configuration.nix
@@ -28,7 +28,6 @@
       service-openssh
       service-binary-cache
       service-nginx
-      user-bmg
       user-hrosten
       user-tervis
     ])
diff --git a/users/bmg.nix b/users/bmg.nix
deleted file mode 100644
index 98552a9e..00000000
--- a/users/bmg.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
-# SPDX-License-Identifier: Apache-2.0
-{
-  users.users = {
-    bmg = {
-      isNormalUser = true;
-      openssh.authorizedKeys.keys = [
-        "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIEJ9ewKwo5FLj6zE30KnTn8+nw7aKdei9SeTwaAeRdJDAAAABHNzaDo="
-        "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIA/pwHnzGNM+ZU4lANGROTRe2ZHbes7cnZn72Oeun/MCAAAABHNzaDo="
-      ];
-      extraGroups = ["wheel" "networkmanager"];
-    };
-  };
-}
diff --git a/users/default.nix b/users/default.nix
index 4fd518d5..5d23dee3 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -1,9 +1,8 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2023-2024 Technology Innovation Institute (TII)
 #
 # SPDX-License-Identifier: Apache-2.0
 {
   flake.nixosModules = {
-    user-bmg = import ./bmg.nix;
     user-builder = import ./builder.nix;
     user-hrosten = import ./hrosten.nix;
     user-tester = import ./tester.nix;