diff --git a/microsoft/surface/common/kernel/linux-6.6.x/default.nix b/microsoft/surface/common/kernel/linux-6.6.x/default.nix
index 666f2ef..0aa0222 100644
--- a/microsoft/surface/common/kernel/linux-6.6.x/default.nix
+++ b/microsoft/surface/common/kernel/linux-6.6.x/default.nix
@@ -7,14 +7,15 @@ let
 
   cfg = config.microsoft-surface;
 
-  version = "6.6.10";
+  version = "6.6.13";
   kernelPatches = surfacePatches {
     inherit version;
     patchFn = ./patches.nix;
   };
   kernelPackages = linuxPackage2 {
     inherit version kernelPatches;
-    sha256 = "sha256-nuYn5MEJrsf8o+2liY6B0gGvLH6y99nX2UwfDhIFVGw=";
+    sha256 = "sha256-iLiefdQerU46seQRyLuNWSV1rPgVzx3zwNxX4uiCwLw=";
+    ignoreConfigErrors=true;
   };
 
 in {
diff --git a/microsoft/surface/common/kernel/linux-6.6.x/patches.nix b/microsoft/surface/common/kernel/linux-6.6.x/patches.nix
index 83048a1..353764b 100644
--- a/microsoft/surface/common/kernel/linux-6.6.x/patches.nix
+++ b/microsoft/surface/common/kernel/linux-6.6.x/patches.nix
@@ -8,10 +8,12 @@
   {
     name = "microsoft-surface-patches-linux-${version}";
     patch = null;
-    structuredExtraConfig = with kernel; {
-      ##
-      ## Surface Aggregator Module
-      ##
+    extraStructuredConfig = with kernel; {
+      STAGING_MEDIA = yes;
+
+      #
+      # Surface Aggregator Module
+      #
       SURFACE_AGGREGATOR = module;
       # SURFACE_AGGREGATOR_ERROR_INJECTION is not set
       SURFACE_AGGREGATOR_BUS = yes;
diff --git a/starfive/visionfive/v2/uboot.nix b/starfive/visionfive/v2/uboot.nix
index c9fde3d..9c0eb7a 100644
--- a/starfive/visionfive/v2/uboot.nix
+++ b/starfive/visionfive/v2/uboot.nix
@@ -6,13 +6,13 @@
 }:
 
 buildUBoot rec {
-  version = "2024.01-rc5";
+  version = "2024.01";
 
   src = fetchFromGitHub {
     owner = "u-boot";
     repo = "u-boot";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QlwgvnSaXh39z9AM7HNF731lRiUkPbN3oQyioQNTYFA=";
+    hash = "sha256-0Da7Czy9cpQ+D5EICc3/QSZhAdCBsmeMvBgykYhAQFw=";
   };
 
   # workaround for https://github.com/NixOS/nixpkgs/pull/146634