diff --git a/home-manager/hosts/bfl-rdesktop/desktops/gnome/default.nix b/home-manager/hosts/bfl-rdesktop/desktops/gnome/default.nix
new file mode 100644
index 00000000..077404aa
--- /dev/null
+++ b/home-manager/hosts/bfl-rdesktop/desktops/gnome/default.nix
@@ -0,0 +1,3 @@
+{
+  
+}
\ No newline at end of file
diff --git a/home-manager/hosts/bfl-rdesktop/desktops/plasma6/default.nix b/home-manager/hosts/bfl-rdesktop/desktops/plasma6/default.nix
new file mode 100644
index 00000000..0db3279e
--- /dev/null
+++ b/home-manager/hosts/bfl-rdesktop/desktops/plasma6/default.nix
@@ -0,0 +1,3 @@
+{
+
+}
diff --git a/home-manager/hosts/bfl-rdesktop/desktops/xfce/default.nix b/home-manager/hosts/bfl-rdesktop/desktops/xfce/default.nix
new file mode 100644
index 00000000..0db3279e
--- /dev/null
+++ b/home-manager/hosts/bfl-rdesktop/desktops/xfce/default.nix
@@ -0,0 +1,3 @@
+{
+
+}
diff --git a/nixos/containers/bfl-rdesktop/default.nix b/nixos/containers/bfl-rdesktop/default.nix
new file mode 100644
index 00000000..8e2d4aa9
--- /dev/null
+++ b/nixos/containers/bfl-rdesktop/default.nix
@@ -0,0 +1,22 @@
+{ pkgs, desktop, username, ... }: {
+  imports = [
+    ../../users/${username}
+    ../../users/jared
+    ../../common/desktops/${desktop}
+    ../../common/packages
+    ../../common/modules/fonts.nix
+    ../../common/software/cli/scripts.nix
+  ];
+
+  hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-module-xrdp ];
+
+  services.xrdp = {
+    enable = true;
+    openFirewall = true;
+    audio = {
+      enable = true;
+      package = pkgs.pulseaudio-module-xrdp;
+    };
+  };
+
+}
diff --git a/nixos/containers/bfl-rdesktop/mounts.nix b/nixos/containers/bfl-rdesktop/mounts.nix
new file mode 100644
index 00000000..5cd1c7af
--- /dev/null
+++ b/nixos/containers/bfl-rdesktop/mounts.nix
@@ -0,0 +1,15 @@
+{
+  "/etc/nixos/git" = {
+    hostPath = "/etc/nixos/git";
+    mountPoint = "/etc/nixos/git";
+    isReadOnly = false;
+  };
+  "/home/albert/.ssh/id_ed25519" = {
+    mountPoint = "/home/albert/.ssh/id_ed25519";
+    isReadOnly = true;
+  };
+  "/home/albert/.ssh/id_ed25519.pub"  = {
+    mountPoint = "/home/albert/.ssh/id_ed25519.pub";
+    isReadOnly = true;
+  };
+}
diff --git a/nixos/containers/rdesktop/default.nix b/nixos/containers/rdesktop/default.nix
index 0c007ad7..525920b3 100644
--- a/nixos/containers/rdesktop/default.nix
+++ b/nixos/containers/rdesktop/default.nix
@@ -8,7 +8,6 @@
     ../../common/software/cli/scripts.nix
     ../../common/services/tailscale-autoconnect.nix
     ../../common/services/syncthing.nix
-    ../../users/jared/default.nix
   ];
 
   hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-module-xrdp ];
diff --git a/nixos/hosts/nuc-server/containers.nix b/nixos/hosts/nuc-server/containers.nix
index 7dc2818b..7d634803 100644
--- a/nixos/hosts/nuc-server/containers.nix
+++ b/nixos/hosts/nuc-server/containers.nix
@@ -4,7 +4,7 @@ let
 in {
 
   containers = {
-    rdesktop = libx.mkContainer { hostname = "rdesktop"; ip = "2"; unfree = true; desktop = "gnome"; };
+    rdesktop = libx.mkContainer { hostname = "bfl-rdesktop"; ip = "2"; unfree = true; desktop = "gnome"; };
   };
 
   # Networking config
@@ -24,7 +24,5 @@ in {
     iptables -A FORWARD -o nix-br0  -j ACCEPT
     iptables -A FORWARD -i nix-br0  -j ACCEPT
     iptables -A OUTPUT  -o nix-br0  -j ACCEPT
-
-    iptables -t nat -A POSTROUTING -s 192.168.2.0/24 ! -d 192.168.2.0/24 -j MASQUERADE
   '';
 }