diff --git a/hosts/bebop/configuration.nix b/hosts/bebop/configuration.nix
index e13a51c..80052e5 100644
--- a/hosts/bebop/configuration.nix
+++ b/hosts/bebop/configuration.nix
@@ -71,7 +71,9 @@ in
   users = {
     # mutableUsers = false;
 
-    groups.fin.members = [ "${user}" "hledger" ];
+    groups = {
+      wiki.members = [ "${user}" "etebase-server" "paperless" ];
+    };
 
     users = {
       root.openssh.authorizedKeys.keys = [
@@ -80,7 +82,7 @@ in
 
       "${user}" = {
         isNormalUser = true;
-        extraGroups = [ "wheel" "docker" "fin" ];
+        extraGroups = [ "wheel" "docker" ];
         openssh.authorizedKeys.keys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPLfc2MW5f4Qn1ifAjPPSTRjDST9Bpwn4M8pWvtYrlnY nixos@wsl@hermes"
         ];
diff --git a/modules/etesync.nix b/modules/etesync.nix
index aa7fe32..b61ffe1 100644
--- a/modules/etesync.nix
+++ b/modules/etesync.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   systemd.tmpfiles.rules = [
-    "f /run/agenix/etebase 0600 etebase-server etebase-server -"
+    "f /run/agenix/etebase 0600 etebase-server wiki -"
   ];
 
   services = {
diff --git a/modules/hledger.nix b/modules/hledger.nix
index 490f3ee..a3aac0d 100644
--- a/modules/hledger.nix
+++ b/modules/hledger.nix
@@ -44,8 +44,6 @@
     };
   };
 
-  users.users.hledger.extraGroups = [ "fin" ];
-
   security.acme = {
     acceptTerms = true;
     certs = {
diff --git a/modules/users.nix b/modules/users.nix
index d66ad98..234373c 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -9,7 +9,7 @@ in
     {
       users.payas = {
         isNormalUser = true;
-        extraGroups = [ "wheel" "networkmanager" "adbusers" "docker" "libvirtd" "fin" ];
+        extraGroups = [ "wheel" "networkmanager" "adbusers" "docker" "libvirtd" ];
         home = "/home/${payas}";
         description = payas;
         group = "payas";
diff --git a/modules/wiki.nix b/modules/wiki.nix
index 504ecf7..f6bad39 100644
--- a/modules/wiki.nix
+++ b/modules/wiki.nix
@@ -26,9 +26,6 @@
         PAPERLESS_URL = "https://paperless.bhankas.org";
         PAPERLESS_ALLOWED_HOSTS = "127.0.0.1,bhankas.org";
         PAPERLESS_CSRF_TRUSTED_ORIGINS = "https://paperless.bhankas.org";
-        PAPERLESS_ADMIN_USER = "bruce";
-        PAPERLESS_ADMIN_PASSWORD = "wayne";
-        PAPERLESS_ADMIN_MAIL = "admin@bhankas.org";
         PAPERLESS_USE_X_FORWARD_HOST = true;
         PAPERLESS_PROXY_SSL_HEADER = "[\"HTTP_XFORWARDED_PROTO\", \"https\"]";
         PAPERLESS_CONSUMER_RECURSIVE = true;