diff --git a/system/desktop.nix b/system/desktop.nix
index 4f2a7344..e569777b 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -32,7 +32,8 @@
 
     # Services
     ./services/openssh.nix
-    ./services/virtualisation.nix
+    ./services/qemukvm.nix
+    #./services/waydroid.nix
     ./services/udev.nix
     ./services/sunshine.nix
     ./services/mpd.nix
diff --git a/system/services/mpd.nix b/system/services/mpd.nix
index 910e1e5f..9f441969 100644
--- a/system/services/mpd.nix
+++ b/system/services/mpd.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  # Enable MPD
+{config, pkgs, ...}: {
   services.mpd = {
     enable = true;
     user = "jimbo";
diff --git a/system/services/virtualisation.nix b/system/services/qemukvm.nix
similarity index 87%
rename from system/services/virtualisation.nix
rename to system/services/qemukvm.nix
index ee357c6f..6456f182 100644
--- a/system/services/virtualisation.nix
+++ b/system/services/qemukvm.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  # Enable virtualization
+{config, pkgs, ...}: {
   virtualisation = {
     libvirtd = {
       enable = true;
@@ -23,7 +18,6 @@
     spiceUSBRedirection.enable = true;
   };
 
-  # Install programs system-wide
   environment.systemPackages = with pkgs; [
     virt-manager
     virtiofsd
diff --git a/system/services/waydroid.nix b/system/services/waydroid.nix
new file mode 100644
index 00000000..00ff0d98
--- /dev/null
+++ b/system/services/waydroid.nix
@@ -0,0 +1,3 @@
+{
+  virtualisation.waydroid.enable = true;
+}