diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix
index a552e63..1b48ffb 100644
--- a/modules/nixos/services/gui/default.nix
+++ b/modules/nixos/services/gui/default.nix
@@ -207,8 +207,11 @@ in
     };
 
     # remote desktop
-    services.xrdp.enable = true;
-    services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
-    services.xrdp.openFirewall = true;
+    networking.firewall.allowedTCPPorts = [ 3389 ];
+    networking.firewall.allowedUDPPorts = [ 3389 ];
+    services.gnome.gnome-remote-desktop.enable = true;
+    systemd.services.gnome-remote-desktop = {
+      wantedBy = [ "graphical.target" ];
+    };
   };
 }
diff --git a/systems/aarch64-linux/m4nix/default.nix b/systems/aarch64-linux/m4nix/default.nix
index d8cd570..e0fc1e7 100644
--- a/systems/aarch64-linux/m4nix/default.nix
+++ b/systems/aarch64-linux/m4nix/default.nix
@@ -34,6 +34,10 @@ with lib.metacfg;
     ];
   };
 
+  services.xrdp.enable = true;
+  services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
+  services.xrdp.openFirewall = true;
+
   # Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI!
   # If no user is logged in, the machine will power down after 20 minutes.
   systemd.targets.sleep.enable = false;
diff --git a/systems/aarch64-linux/rnix/default.nix b/systems/aarch64-linux/rnix/default.nix
index d8cd570..e0fc1e7 100644
--- a/systems/aarch64-linux/rnix/default.nix
+++ b/systems/aarch64-linux/rnix/default.nix
@@ -34,6 +34,10 @@ with lib.metacfg;
     ];
   };
 
+  services.xrdp.enable = true;
+  services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
+  services.xrdp.openFirewall = true;
+
   # Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI!
   # If no user is logged in, the machine will power down after 20 minutes.
   systemd.targets.sleep.enable = false;