diff --git a/hosts/fw/modules/cloonar-assistant-config-server.nix b/hosts/fw/modules/cloonar-assistant-config-server.nix
index d229c8f..99745ea 100644
--- a/hosts/fw/modules/cloonar-assistant-config-server.nix
+++ b/hosts/fw/modules/cloonar-assistant-config-server.nix
@@ -6,9 +6,11 @@
   users = [
     {
       username = "ca-test";
-      key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGzJRWe8hsqAVnGSjPrcheloteWMzORoQ5Gj4IfhCROF";
+      key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDglSLU9AUtbU0fCN0eByi/EHyo1QiPPLiscN5RAR+wq";
     }
   ];
+
+  userList = lib.concatStringsSep "," (map (u: u.username) users);
 in {
   environment.etc = {
     # our single user+key file
@@ -39,7 +41,7 @@ in {
   ) users;
 
   services.openssh.extraConfig = ''
-    Match Exec "/bin/grep -qE '^%u[[:space:]]' /etc/cloonar_assistant_ssh/sftp_users_keys"
+    Match User ${userList}
        X11Forwarding no
        AllowTcpForwarding no
        ChrootDirectory /home/cloonar-assistant-configs/%u