diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix
index 717a4f3..50c32e9 100644
--- a/modules/nixos/services/gui/default.nix
+++ b/modules/nixos/services/gui/default.nix
@@ -15,7 +15,7 @@ in
 
       flatpak.enable = true;
 
-      pcscd.enable = false;
+      #pcscd.enable = false;
 
       # Enable CUPS to print documents.
       printing.enable = true;
@@ -95,7 +95,7 @@ in
       nixpkgs-fmt
       opensc
       pasystray
-      #pcsctools
+      pcsctools
       pinentry-gnome
       pkg-config
       ripgrep
diff --git a/modules/nixos/services/podman/default.nix b/modules/nixos/services/podman/default.nix
index 9746e18..836eae8 100644
--- a/modules/nixos/services/podman/default.nix
+++ b/modules/nixos/services/podman/default.nix
@@ -15,7 +15,7 @@ in
         enable = true;
 
         # Create a `docker` alias for podman, to use it as a drop-in replacement
-        dockerCompat = lib.mkDefault true;
+        dockerCompat = true;
 
         # For Nixos version > 22.11
         defaultNetwork.settings = { dns_enabled = true; };
diff --git a/systems/x86_64-linux/sgx/default.nix b/systems/x86_64-linux/sgx/default.nix
index f53bc16..8e9d3ba 100644
--- a/systems/x86_64-linux/sgx/default.nix
+++ b/systems/x86_64-linux/sgx/default.nix
@@ -19,9 +19,6 @@ with lib.plusultra;
     user.extraGroups = [ "docker" "sgx" ];
   };
 
-  virtualisation.docker.enable = true;
-  virtualisation.podman.dockerCompat = false;
-  
   system.autoUpgrade = {
     enable = true;
     operation = "boot";
@@ -33,7 +30,7 @@ with lib.plusultra;
 
   networking.wireless.enable = false; # Enables wireless support via wpa_supplicant.
 
-  # services.aesmd.enable = true;
+  services.aesmd.enable = true;
 
   powerManagement.cpuFreqGovernor = "ondemand";