diff --git a/Dockerfile b/Dockerfile
index febbe9b..5b5cf5a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ FROM builder as build_opensbi
 WORKDIR /build
 RUN git clone --depth 1 --branch v1.2 https://github.com/riscv-software-src/opensbi
 WORKDIR /build/opensbi
-RUN eatmydata make $CROSS PLATFORM=generic FW_PIC=y BUILD_INFO=y
+RUN eatmydata make $CROSS PLATFORM=generic FW_PIC=y FW_OPTIONS=0x2
 # The binary is located here: /build/opensbi/build/platform/generic/firmware/fw_dynamic.bin
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 1976ad3..7944a0d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,8 +11,8 @@ services:
             BOARD: lichee_rv_dock
             DISK_MB: 7300
             GNU_TOOLS_TAG: 10.2.1
-            UBOOT_TAG: d1-2022-10-31
-            KERNEL_TAG: d1-wip-v5.18-rc1
+            UBOOT_TAG: d1-wip
+            KERNEL_TAG: d1/all
             KERNEL_COMMIT: ""
     volumes:
         - './lichee_rv_dock:/outport'
diff --git a/kernel/update_kernel_config.sh b/kernel/update_kernel_config.sh
index 21701b4..4909e28 100755
--- a/kernel/update_kernel_config.sh
+++ b/kernel/update_kernel_config.sh
@@ -109,7 +109,6 @@ add_config 'CONFIG_CRYPTO_CCM' 'y'
 add_config 'CONFIG_CRYPTO_GCM' 'y'
 add_config 'CONFIG_CRYPTO_CMAC' 'y'
 add_config 'CONFIG_CRC32' 'y'
-
 #
 #   Enable device tree overlays
 #