diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 229ced6..b671add 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -125,7 +125,6 @@
   # Configure console keymap
   console.keyMap = "us-acentos";
 
-  users.groups.nixpow.members = [ "root" ];
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users = {
     root = {
@@ -134,7 +133,7 @@
     noa = {
       isNormalUser = true;
       description = "Noa Aarts";
-      extraGroups = [ "networkmanager" "wheel" "nixpow" ];
+      extraGroups = [ "networkmanager" "wheel" "docker" ];
       hashedPassword = "$6$rounds=512400$Zip3xoK2zcoR4qEL$N13YTHO5tpWfx2nKb1sye.ZPwfoRtMQ5f3YrMZqKzzoFoSSHHJ.l5ulCEa9HygFxZmBtPnwlseFEtl8ERnwF50";
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBFemc4Pzp7I0y8FHxgRO/c/ReBmXuqXR6CWqbhiQ+0t noa@Noas_flaptop"
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index 04f1c08..3b2694f 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -56,11 +56,7 @@
     };
     noa = {
       isNormalUser = true;
-      extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-      packages = with pkgs; [
-        firefox
-        tree
-      ];
+      extraGroups = [ "networkmanager" "wheel" "docker" ];
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINWtje7dGqyrBY7PLq6DANvUR6yfungQNsXGkTO6PP6/ noa@NoasPCArch"
       ];