diff --git a/modules/modules.nix b/modules/modules.nix
index 06d1c3315..d75685865 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -368,6 +368,7 @@ let
     ./services/unison.nix
     ./services/vdirsyncer.nix
     ./services/volnoti.nix
+    ./services/waydroid.nix
     ./services/window-managers/awesome.nix
     ./services/window-managers/bspwm/default.nix
     ./services/window-managers/fluxbox.nix
diff --git a/modules/services/waydroid.nix b/modules/services/waydroid.nix
new file mode 100644
index 000000000..be91c95f9
--- /dev/null
+++ b/modules/services/waydroid.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.waydroid;
+
+in {
+  options.services.waydroid.enable = mkEnableOption "Waydroid Android container";
+
+  config = mkIf cfg.enable {
+
+    systemd.user.services.waydroid-session = {
+      Unit = {
+        Description = "Waydroid user session";
+        Requires = [ "waydroid-container.service" ];
+      };
+      Install.WantedBy = [ "default.target" ];
+      Service = {
+        ExecStart =
+          "${pkgs.waydroid}/bin/waydroid session start";
+        Restart = "always";
+        RestartSec = 12;
+      };
+    };
+  };
+}