diff --git a/hosts/murex-pecten.nix b/hosts/murex-pecten.nix
index 21ef749..4cb9930 100644
--- a/hosts/murex-pecten.nix
+++ b/hosts/murex-pecten.nix
@@ -112,10 +112,6 @@
       services.login.yubicoAuth = true;
     };
 
-    # TODO: Remove/Move
-    services.mysql.enable = true;
-    services.mysql.package = pkgs.mariadb;
-
     services.udev.customRules = [
       # Rename the Scarlett Solo using udev
       {
diff --git a/modules/deck.nix b/modules/deck.nix
index c6de8d6..4f025a6 100644
--- a/modules/deck.nix
+++ b/modules/deck.nix
@@ -34,21 +34,15 @@ in {
       openssh.authorizedKeys.keyFiles = [../users/malte/yubikey.pub];
     };
 
-    # My huge NVME USB Stick
-    fileSystems."/butterjunge" = {
-      device = "/dev/disk/by-id/usb-SHARGE_DISK_012345679841-0:0-part2";
-      fsType = "btrfs";
-      options = [
-        "compress=lzo"
-      ];
-    };
-    fileSystems."/home/deck/butterjunge" = {
-      device = "/butterjunge";
-      options = [
-        "bind"
-        "compress=lzo"
-        "map=1000/deck:@100/@users"
-      ];
+    # include the sd card, if any is inserted
+    fileSystems = {
+      "/home/deck/sdcard" = {
+        device = "/dev/mmcblk0p1";
+        fsType = "ext4";
+        options = [
+          "nofail"
+        ];
+      };
     };
 
     home-manager.users.deck.imports = [../users/deck/home.nix inputs.nix-colors.homeManagerModule inputs.hyprland.homeManagerModules.default];
diff --git a/modules/malte.nix b/modules/malte.nix
index f8dade7..5f1979b 100644
--- a/modules/malte.nix
+++ b/modules/malte.nix
@@ -59,20 +59,19 @@ in {
       enableNvidiaPatches = config.settings.nvidiaUsed;
     };
 
-    # My huge NVME USB Stick
-    fileSystems."/butterjunge" = {
-      device = "/dev/disk/by-id/usb-SHARGE_DISK_012345679841-0:0-part2";
-      fsType = "btrfs";
-      options = [
-        "compress=lzo"
-      ];
-    };
-    fileSystems."/home/malte/butterjunge" = {
-      device = "/butterjunge";
-      options = [
-        "bind"
-        "compress=lzo"
-        "map=1000/malte:@100/@users"
+    # TODO: Remove/Move
+    services.mysql = {
+      enable = true;
+      package = pkgs.mariadb;
+      ensureDatabases = ["notenbuch"];
+      ensureUsers = [
+        {
+          name = "malte";
+          ensurePermissions = {
+            "notenbuch.*" = "ALL PRIVILEGES";
+            "*.*" = "CREATE USER, GRANT OPTION, RELOAD, SELECT, DROP";
+          };
+        }
       ];
     };