diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix
index 5b7c66b..a552e63 100644
--- a/modules/nixos/services/gui/default.nix
+++ b/modules/nixos/services/gui/default.nix
@@ -167,6 +167,7 @@ in
         yubikey-personalization
         zellij
         jetbrains-toolbox
+        gnome-remote-desktop
       ]
       ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
         with pkgs;
@@ -206,10 +207,8 @@ in
     };
 
     # remote desktop
-    networking.firewall.allowedTCPPorts = [ 3389 ];
-    services.gnome.gnome-remote-desktop.enable = true;
-    systemd.services.gnome-remote-desktop = {
-      wantedBy = [ "graphical.target" ];
-    };
+    services.xrdp.enable = true;
+    services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
+    services.xrdp.openFirewall = true;
   };
 }
diff --git a/systems/aarch64-linux/m4nix/default.nix b/systems/aarch64-linux/m4nix/default.nix
index e0fc1e7..d8cd570 100644
--- a/systems/aarch64-linux/m4nix/default.nix
+++ b/systems/aarch64-linux/m4nix/default.nix
@@ -34,10 +34,6 @@ 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 e0fc1e7..d8cd570 100644
--- a/systems/aarch64-linux/rnix/default.nix
+++ b/systems/aarch64-linux/rnix/default.nix
@@ -34,10 +34,6 @@ 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;