diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
index f1cfe2c..da23cb9 100644
--- a/.github/workflows/flowzone.yml
+++ b/.github/workflows/flowzone.yml
@@ -51,4 +51,4 @@ jobs:
           "linux/arm64": ["self-hosted","ARM64"]
         }  
       docker_images: ghcr.io/product-os/github-runner-kernel
-      bake_targets: default,linux61
+      bake_targets: linux510,linux61
diff --git a/Dockerfile b/Dockerfile
index f220ce3..0b018ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update \
     zstd \
     && rm -rf /var/lib/apt/lists/*
 
-ARG KERNEL_BRANCH=5.10
+ARG KERNEL_BRANCH=6.1
 
 RUN git clone --depth 1 -c advice.detachedHead=false \
     --branch "v${KERNEL_BRANCH}" https://github.com/torvalds/linux.git .
diff --git a/config/5.10/microvm-kernel-aarch64-5.10.config b/config/5.10/microvm-kernel-aarch64-5.10.config
index a4a002b..73ce872 100644
--- a/config/5.10/microvm-kernel-aarch64-5.10.config
+++ b/config/5.10/microvm-kernel-aarch64-5.10.config
@@ -2413,14 +2413,7 @@ CONFIG_NFS_V4=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
-CONFIG_NFSD=y
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-# CONFIG_NFSD_BLOCKLAYOUT is not set
-# CONFIG_NFSD_SCSILAYOUT is not set
-# CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
+# CONFIG_NFSD is not set
 CONFIG_GRACE_PERIOD=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
diff --git a/config/5.10/microvm-kernel-x86_64-5.10.config b/config/5.10/microvm-kernel-x86_64-5.10.config
index ec13ca8..7a07ce3 100644
--- a/config/5.10/microvm-kernel-x86_64-5.10.config
+++ b/config/5.10/microvm-kernel-x86_64-5.10.config
@@ -2350,14 +2350,7 @@ CONFIG_NFS_V4=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
-CONFIG_NFSD=y
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-# CONFIG_NFSD_BLOCKLAYOUT is not set
-# CONFIG_NFSD_SCSILAYOUT is not set
-# CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
+# CONFIG_NFSD is not set
 CONFIG_GRACE_PERIOD=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
diff --git a/config/6.1/microvm-kernel-aarch64-6.1.config b/config/6.1/microvm-kernel-aarch64-6.1.config
index 2ee96db..0b156bb 100644
--- a/config/6.1/microvm-kernel-aarch64-6.1.config
+++ b/config/6.1/microvm-kernel-aarch64-6.1.config
@@ -2533,13 +2533,7 @@ CONFIG_NFS_V4=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
-CONFIG_NFSD=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-# CONFIG_NFSD_BLOCKLAYOUT is not set
-# CONFIG_NFSD_SCSILAYOUT is not set
-# CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
+# CONFIG_NFSD is not set
 CONFIG_GRACE_PERIOD=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
diff --git a/config/6.1/microvm-kernel-x86_64-6.1.config b/config/6.1/microvm-kernel-x86_64-6.1.config
index d756e5b..be7cfcc 100644
--- a/config/6.1/microvm-kernel-x86_64-6.1.config
+++ b/config/6.1/microvm-kernel-x86_64-6.1.config
@@ -2488,13 +2488,7 @@ CONFIG_NFS_V4=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
-CONFIG_NFSD=y
-# CONFIG_NFSD_V3_ACL is not set
-CONFIG_NFSD_V4=y
-# CONFIG_NFSD_BLOCKLAYOUT is not set
-# CONFIG_NFSD_SCSILAYOUT is not set
-# CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFSD_V4_SECURITY_LABEL is not set
+# CONFIG_NFSD is not set
 CONFIG_GRACE_PERIOD=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y