diff --git a/modules/apps/gui/default.nix b/modules/apps/gui/default.nix
index 37e6743..05a549f 100644
--- a/modules/apps/gui/default.nix
+++ b/modules/apps/gui/default.nix
@@ -6,7 +6,6 @@
     ./games
     ./nemo
     ./rofi
-    ./vm
     ./misc
   ];
 }
diff --git a/modules/services/default.nix b/modules/services/default.nix
index f1f8eb7..da8d987 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -1,10 +1,11 @@
 {
   imports = [
-    ./dunst
+    ./vm
     ./gdm
+    ./dunst
     ./polkit
     ./syncthing
-    ./virt
+    ./docker
     ./misc
   ];
 }
diff --git a/modules/services/virt/default.nix b/modules/services/docker/default.nix
similarity index 69%
rename from modules/services/virt/default.nix
rename to modules/services/docker/default.nix
index d267f72..6cc1210 100644
--- a/modules/services/virt/default.nix
+++ b/modules/services/docker/default.nix
@@ -1,5 +1,5 @@
 {...}: {
   virtualisation.docker.rootless.enable = true;
   virtualisation.docker.enable = true;
-  virtualisation.waydroid.enable = true;
+  users.users.joy.extraGroups = ["docker"];
 }
diff --git a/modules/apps/gui/vm/default.nix b/modules/services/vm/default.nix
similarity index 100%
rename from modules/apps/gui/vm/default.nix
rename to modules/services/vm/default.nix
diff --git a/modules/system/user/default.nix b/modules/system/user/default.nix
index a5942e5..2952e06 100644
--- a/modules/system/user/default.nix
+++ b/modules/system/user/default.nix
@@ -2,6 +2,6 @@
   users.users.joy = {
     isNormalUser = true;
     description = "joy";
-    extraGroups = ["wheel" "docker"];
+    extraGroups = ["wheel"];
   };
 }