diff --git a/lib/default.nix b/lib/default.nix
index 75c5a836..2f6d6e14 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -50,7 +50,7 @@
       ( import ../nixos/containers/mounts.nix )
       ( import ../nixos/containers/${hostname}/mounts.nix )
     ];
-    ephemeral        = false;
+    ephemeral        = ephemeral;
     autoStart        = true;
     privateNetwork   = true;
     hostBridge       = "nix-br0";
diff --git a/nixos/containers/default.nix b/nixos/containers/default.nix
index 10112c86..e40e2192 100644
--- a/nixos/containers/default.nix
+++ b/nixos/containers/default.nix
@@ -8,6 +8,7 @@
     ../common/services/promtail.nix
     ../common/services/telegraf.nix
     ../common/services/openssh.nix
+    ../common/services/gnupg-agent.nix
   ];
 
   networking.interfaces.eth0.ipv4.addresses = [{
@@ -49,5 +50,19 @@
   networking.extraHosts = ''
     100.64.0.14 influx.sysctl.io
     100.64.0.14 loki.sysctl.io
-  '';
+    '';
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+
 }
diff --git a/nixos/containers/rdesktop/default.nix b/nixos/containers/rdesktop/default.nix
index 54287b62..5752b0dd 100644
--- a/nixos/containers/rdesktop/default.nix
+++ b/nixos/containers/rdesktop/default.nix
@@ -1,8 +1,4 @@
-{ username, ... }: 
-  let
-    unfree = true;
-    desktop = "xfce";
-  in {
+{ desktop, username, ... }: {
   imports = [
     ../../users/${username}
     ../../common/desktops/${desktop}
diff --git a/nixos/hosts/framework-server/containers.nix b/nixos/hosts/framework-server/containers.nix
index e2f50e4a..5a259f91 100644
--- a/nixos/hosts/framework-server/containers.nix
+++ b/nixos/hosts/framework-server/containers.nix
@@ -4,7 +4,7 @@ let
 in {
 
   containers = {
-    rdesktop = libx.mkContainer { hostname = "rdesktop"; ip = "2"; };
+    rdesktop = libx.mkContainer { hostname = "rdesktop"; ip = "2"; desktop = "xfce"; unfree = true; };
   };
 
   # Networking config
diff --git a/nixos/hosts/piaware-rpi4/containers/piaware.nix b/nixos/hosts/piaware-rpi4/containers/piaware.nix
index 457fc2c9..f1649071 100644
--- a/nixos/hosts/piaware-rpi4/containers/piaware.nix
+++ b/nixos/hosts/piaware-rpi4/containers/piaware.nix
@@ -1,5 +1,4 @@
-# Auto-generated using compose2nix v0.1.6.
-{ pkgs, lib, ... }: {
+{ ... }: {
   # Containers
   virtualisation.oci-containers.containers."piaware" = {
     image = "ghcr.io/sdr-enthusiasts/docker-piaware:latest";
@@ -18,38 +17,4 @@
       "--network=piaware-default"
     ];
   };
-  systemd.services."podman-piaware" = {
-    serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
-    };
-    after    = [ "podman-network-piaware-default.service" ];
-    requires = [ "podman-network-piaware-default.service" ];
-    partOf   = [ "podman-compose-piaware-root.target" ];
-    wantedBy = [ "podman-compose-piaware-root.target" ];
-  };
-
-  # Networks
-  systemd.services."podman-network-piaware-default" = {
-    path = [ pkgs.podman ];
-    serviceConfig = {
-      Type = "oneshot";
-      RemainAfterExit = true;
-      ExecStop = "${pkgs.podman}/bin/podman network rm -f piaware-default";
-    };
-    script = ''
-      podman network inspect piaware-default || podman network create piaware-default --opt isolate=true
-    '';
-    partOf   = [ "podman-compose-piaware-root.target" ];
-    wantedBy = [ "podman-compose-piaware-root.target" ];
-  };
-
-  # Root service
-  # When started, this will automatically create all resources and start
-  # the containers. When stopped, this will teardown all resources.
-  systemd.targets."podman-compose-piaware-root" = {
-    unitConfig = {
-      Description = "Root target generated by compose2nix.";
-    };
-    wantedBy = [ "multi-user.target" ];
-  };
 }