diff --git a/flake.lock b/flake.lock
index 455abbe..79761a8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -104,11 +104,11 @@
     },
     "crane": {
       "locked": {
-        "lastModified": 1776635034,
-        "narHash": "sha256-OEOJrT3ZfwbChzODfIH4GzlNTtOFuZFWPtW7jIeR8xU=",
+        "lastModified": 1777242778,
+        "narHash": "sha256-VWTeqWeb8Sel/QiWyaPvCa9luAbcGawR+Rw09FJoHz0=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "dc7496d8ea6e526b1254b55d09b966e94673750f",
+        "rev": "ad8b31ad0ba8448bd958d7a5d50d811dc5d271c0",
         "type": "github"
       },
       "original": {
@@ -387,11 +387,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777196875,
-        "narHash": "sha256-6M/rTHxFRdKJ6WZYxrCl68qIyh3BvjWBmYC7Vufolbg=",
+        "lastModified": 1777308348,
+        "narHash": "sha256-DJx9wnerjsOqKOo8I7/u5ENRhRWFF2mbYcACF+mn5LU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "38bf0202cae280174cbb80fc24a63978f16333f7",
+        "rev": "a28e848a01044f47679453aae75f6253bef7903e",
         "type": "github"
       },
       "original": {
@@ -428,11 +428,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1776797459,
-        "narHash": "sha256-utv296Xwk0PwjONe9dsyKx+9Z5xAB70aAsMI//aakpg=",
+        "lastModified": 1777299656,
+        "narHash": "sha256-c0r3xXp2+xFJwkryS+nhyQwoACbFzSt4C1TVs3QMh8E=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "4eda91dd5abd2157a2c7bfb33142fc64da668b0a",
+        "rev": "079c608988c2747db3902c9de033572cd50e8656",
         "type": "github"
       },
       "original": {
@@ -553,11 +553,11 @@
     },
     "nixpkgs-edge": {
       "locked": {
-        "lastModified": 1777201227,
-        "narHash": "sha256-A4+ftd34lOb1d3S1yYw6Zep6Bgo0iQYLJSHPB4fmtvw=",
+        "lastModified": 1777318891,
+        "narHash": "sha256-QWNnqGbcUcVkzcoLzqZaSJYujxjiMCBx4OjcnbyKOPc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2e46153090fbd785ac9f3c962eb2155ec54e9a94",
+        "rev": "a884d5059f68095fe8becb4fadbf645f86fac4de",
         "type": "github"
       },
       "original": {
@@ -600,11 +600,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1776548001,
-        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
+        "lastModified": 1776877367,
+        "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
+        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
         "type": "github"
       },
       "original": {
@@ -752,11 +752,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775585728,
-        "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=",
+        "lastModified": 1776796298,
+        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "580633fa3fe5fc0379905986543fd7495481913d",
+        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
         "type": "github"
       },
       "original": {
@@ -811,11 +811,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776741231,
-        "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=",
+        "lastModified": 1777173302,
+        "narHash": "sha256-ERiu3cbxvnTDxiDcimRA7af7xp6x1y0sRyLGm28Qzz8=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b",
+        "rev": "aaec8c50baeaf2f2ba653e8aae71778a2bbbac94",
         "type": "github"
       },
       "original": {
@@ -853,11 +853,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1776950941,
-        "narHash": "sha256-idwZcvnxHUTd6qI2E0SW4gzeyfBlVZq7JoEonjAY2Dc=",
+        "lastModified": 1777287493,
+        "narHash": "sha256-Fj7S91TuZm6+DG/v6SFme/p+sWrYMQICGX6yQ5KD43Q=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "e6c4a96f5034c3686c24021d03515e17d02c46cd",
+        "rev": "e33fbde199eaad513ef5d0746db19d5878150232",
         "type": "gitlab"
       },
       "original": {
diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix
index ed564ed..462df63 100644
--- a/home-manager/hosts/EDI/lillian.nix
+++ b/home-manager/hosts/EDI/lillian.nix
@@ -16,7 +16,6 @@
   ];
 
   home.packages = with pkgs; [
-    lutris
     android-tools
   ];
 
diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix
index 3d0af5d..6560300 100644
--- a/home-manager/hosts/GLaDOS/lillian.nix
+++ b/home-manager/hosts/GLaDOS/lillian.nix
@@ -22,7 +22,6 @@
   home.packages = with pkgs; [
     r2modman
     ryubing
-    lutris
     vscodium
     unrar
     intiface-central
diff --git a/modules/nixos/shared-packages/default.nix b/modules/nixos/shared-packages/default.nix
index afad336..68c1115 100644
--- a/modules/nixos/shared-packages/default.nix
+++ b/modules/nixos/shared-packages/default.nix
@@ -84,7 +84,6 @@ let cfg = config.sharedPackages; in {
       aha
       ttf-ms-win10
       wineWow64Packages.stable
-      bottles
       tpm2-abrmd
       jdk21_headless
       #bcachefs-tools
diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
index a474a0f..01a376a 100644
--- a/nixos/desktop/default.nix
+++ b/nixos/desktop/default.nix
@@ -102,7 +102,21 @@
       aha
       ttf-ms-win10
       wineWow64Packages.stable
-      bottles
+      # (pkgs.bottles.override {
+      # Intercept buildFHSEnv to modify target packages
+      # buildFHSEnv = args: pkgs.buildFHSEnv (args // {
+      # multiPkgs = envPkgs:
+      # let
+      # Fetch original package list
+      # originalPkgs = args.multiPkgs envPkgs;
+
+      # Disable tests for openldap
+      # customLdap = envPkgs.openldap.overrideAttrs (_: { doCheck = false; });
+      # in
+      # Replace broken openldap with the custom one
+      # builtins.filter (p: (p.pname or "") != "openldap") originalPkgs ++ [ customLdap ];
+      # });
+      # })
       tpm2-abrmd
       jdk21_headless
       #bcachefs-tools
@@ -163,6 +177,21 @@
       wireplumber
       intiface-central
       #rustdesk
+      # (pkgs.lutris.override {
+      # Intercept buildFHSEnv to modify target packages
+      # buildFHSEnv = args: pkgs.buildFHSEnv (args // {
+      # multiPkgs = envPkgs:
+      # let
+      # Fetch original package list
+      # originalPkgs = args.multiPkgs envPkgs;
+
+      # Disable tests for openldap
+      # customLdap = envPkgs.openldap.overrideAttrs (_: { doCheck = false; });
+      # in
+      # Replace broken openldap with the custom one
+      # builtins.filter (p: (p.pname or "") != "openldap") originalPkgs ++ [ customLdap ];
+      # });
+      # })
     ]
     ++ (with pkgs-edge; [
       kdePackages.plasma-vault
diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix
index bc6f20a..0ca4f55 100644
--- a/nixos/hosts/shodan/configuration.nix
+++ b/nixos/hosts/shodan/configuration.nix
@@ -116,7 +116,6 @@
     legendary-gl
     protontricks
     rare
-    lutris
 
     (kodi.withPackages (kodiPkgs:
       with kodiPkgs; [