diff --git a/nixos/common/desktops/xfce/default.nix b/nixos/common/desktops/xfce/default.nix
index 57d1b083..a080782a 100644
--- a/nixos/common/desktops/xfce/default.nix
+++ b/nixos/common/desktops/xfce/default.nix
@@ -26,5 +26,6 @@
     papirus-nord
     xfce.xfwm4-themes
     xfce4-docklike-plugin
+    dconf2nix # https://github.com/gvolpe/dconf2nix
   ];
 }
diff --git a/nixos/hosts/framework-server/containers.nix b/nixos/hosts/framework-server/containers.nix
index 09cf0cde..cb837877 100644
--- a/nixos/hosts/framework-server/containers.nix
+++ b/nixos/hosts/framework-server/containers.nix
@@ -6,6 +6,6 @@ in {
 
   # Set up the bridge network:
   containers = {
-    rdesktop = libx.mkContainer { hostname = "rdesktop"; desktop = "plasma6"; unfree = true; };
+    rdesktop = libx.mkContainer { hostname = "rdesktop"; desktop = "xfce"; unfree = true; };
   };
 } 
diff --git a/nixos/hosts/framework-server/firewall.nix b/nixos/hosts/framework-server/firewall.nix
index 50798331..6085d996 100644
--- a/nixos/hosts/framework-server/firewall.nix
+++ b/nixos/hosts/framework-server/firewall.nix
@@ -21,7 +21,6 @@
       ];
       allowedUDPPorts = [
         53    # DNS (udp)
-        3478  # Headscale DERP (udp)
         10000 # Jitsi Meet (udp)
       ];
     };
diff --git a/nixos/hosts/milan-linode-01/podman/derp.nix b/nixos/hosts/milan-linode-01/containers/derp.nix
similarity index 70%
rename from nixos/hosts/milan-linode-01/podman/derp.nix
rename to nixos/hosts/milan-linode-01/containers/derp.nix
index ab1fcbda..666f815e 100644
--- a/nixos/hosts/milan-linode-01/podman/derp.nix
+++ b/nixos/hosts/milan-linode-01/containers/derp.nix
@@ -31,35 +31,35 @@
       "--network=headscale-default"
     ];
   };
-  systemd.services."podman-headscale-derp" = {
+  systemd.services."docker-headscale-derp" = {
     serviceConfig = {
       Restart = lib.mkOverride 500 "always";
     };
-    after    = [ "podman-network-headscale-default.service" ];
-    requires = [ "podman-network-headscale-default.service" ];
-    partOf   = [ "podman-compose-headscale-root.target" ];
-    wantedBy = [ "podman-compose-headscale-root.target" ];
+    after    = [ "docker-network-headscale-default.service" ];
+    requires = [ "docker-network-headscale-default.service" ];
+    partOf   = [ "docker-compose-headscale-root.target" ];
+    wantedBy = [ "docker-compose-headscale-root.target" ];
   };
 
   # Networks
-  systemd.services."podman-network-headscale-default" = {
-    path = [ pkgs.podman ];
+  systemd.services."docker-network-headscale-default" = {
+    path = [ pkgs.docker ];
     serviceConfig = {
       Type = "oneshot";
       RemainAfterExit = true;
-      ExecStop = "${pkgs.podman}/bin/podman network rm -f headscale-default";
+      ExecStop = "${pkgs.docker}/bin/docker network rm -f headscale-default";
     };
     script = ''
-      podman network inspect headscale-default || podman network create headscale-default --opt isolate=true
+      docker network inspect headscale-default || docker network create headscale-default --opt isolate=true
     '';
-    partOf   = [ "podman-compose-headscale-root.target" ];
-    wantedBy = [ "podman-compose-headscale-root.target" ];
+    partOf   = [ "docker-compose-headscale-root.target" ];
+    wantedBy = [ "docker-compose-headscale-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-headscale-root" = {
+  systemd.targets."docker-compose-headscale-root" = {
     unitConfig = {
       Description = "Root target generated by compose2nix.";
     };
diff --git a/nixos/hosts/milan-linode-01/default.nix b/nixos/hosts/milan-linode-01/default.nix
index 965b1f4f..2aebe100 100644
--- a/nixos/hosts/milan-linode-01/default.nix
+++ b/nixos/hosts/milan-linode-01/default.nix
@@ -2,9 +2,9 @@
   imports = [ 
     (modulesPath + "/profiles/qemu-guest.nix")
     ../../common/services/tailscale-autoconnect.nix
-    ../../common/services/podman.nix
+    ../../common/services/docker.nix
     ./firewall.nix
-    ./podman/derp.nix
+    ./containers/derp.nix
   ];
 
   boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ];
diff --git a/nixos/hosts/osaka-linode-01/podman/derp.nix b/nixos/hosts/osaka-linode-01/containers/derp.nix
similarity index 73%
rename from nixos/hosts/osaka-linode-01/podman/derp.nix
rename to nixos/hosts/osaka-linode-01/containers/derp.nix
index 3170a206..24ea30ef 100644
--- a/nixos/hosts/osaka-linode-01/podman/derp.nix
+++ b/nixos/hosts/osaka-linode-01/containers/derp.nix
@@ -32,43 +32,43 @@
       "--network=headscale-default"
     ];
   };
-  systemd.services."podman-headscale-derp" = {
+  systemd.services."docker-headscale-derp" = {
     serviceConfig = {
       Restart = lib.mkOverride 500 "always";
     };
     after = [
-      "podman-network-headscale-default.service"
+      "docker-network-headscale-default.service"
     ];
     requires = [
-      "podman-network-headscale-default.service"
+      "docker-network-headscale-default.service"
     ];
     partOf = [
-      "podman-compose-headscale-root.target"
+      "docker-compose-headscale-root.target"
     ];
     wantedBy = [
-      "podman-compose-headscale-root.target"
+      "docker-compose-headscale-root.target"
     ];
   };
 
   # Networks
-  systemd.services."podman-network-headscale-default" = {
-    path = [ pkgs.podman ];
+  systemd.services."docker-network-headscale-default" = {
+    path = [ pkgs.docker ];
     serviceConfig = {
       Type = "oneshot";
       RemainAfterExit = true;
-      ExecStop = "${pkgs.podman}/bin/podman network rm -f headscale-default";
+      ExecStop = "${pkgs.docker}/bin/docker network rm -f headscale-default";
     };
     script = ''
-      podman network inspect headscale-default || podman network create headscale-default --opt isolate=true
+      docker network inspect headscale-default || docker network create headscale-default --opt isolate=true
     '';
-    partOf = [ "podman-compose-headscale-root.target" ];
-    wantedBy = [ "podman-compose-headscale-root.target" ];
+    partOf = [ "docker-compose-headscale-root.target" ];
+    wantedBy = [ "docker-compose-headscale-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-headscale-root" = {
+  systemd.targets."docker-compose-headscale-root" = {
     unitConfig = {
       Description = "Root target generated by compose2nix.";
     };
diff --git a/nixos/hosts/osaka-linode-01/default.nix b/nixos/hosts/osaka-linode-01/default.nix
index 02e2d3c0..df961d12 100644
--- a/nixos/hosts/osaka-linode-01/default.nix
+++ b/nixos/hosts/osaka-linode-01/default.nix
@@ -2,10 +2,10 @@
   imports = [ 
     (modulesPath + "/profiles/qemu-guest.nix")
     ../../common/services/tailscale-autoconnect.nix
-    ../../common/services/podman.nix
+    ../../common/services/docker.nix
     ./firewall.nix
     ./wireguard.nix
-    ./podman/derp.nix
+    ./containers/derp.nix
   ];
 
   boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ];