diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index 38c044be4..3e9548aa1 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -6,7 +6,9 @@
     [ # Include the results of the hardware scan.
       <stockholm/makefu>
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
-      (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
+      { ## Guest Extensions are currently broken
+        # virtualisation.virtualbox.guest.enable = true;
+      }
       <stockholm/makefu/2configs/main-laptop.nix>
       # <secrets/extra-hosts.nix>
 
@@ -50,7 +52,7 @@
   fileSystems."/media/share" = {
     fsType = "vboxsf";
     device = "share";
-    options = [ "rw" "uid=9001" "gid=9001" ];
+    options = [ "rw" "uid=9001" "gid=9001" "nofail" ];
   };
 
 }
diff --git a/makefu/1systems/vbob/config.nix b/makefu/1systems/vbob/config.nix
index ffd9deaee..24d42a69b 100644
--- a/makefu/1systems/vbob/config.nix
+++ b/makefu/1systems/vbob/config.nix
@@ -8,8 +8,12 @@
       {
         imports = [<stockholm/makefu/2configs/fs/single-partition-ext4.nix> ];
         boot.loader.grub.device = "/dev/sda";
-        virtualisation.virtualbox.guest.enable = true;
       }
+
+      { ## Virtualbox guest is broken on newer kernel
+        # virtualisation.virtualbox.guest.enable = true;
+      }
+
       # {
       #   imports = [
       #     <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>