diff --git a/ci/Dockerfile b/ci/Dockerfile
index 485d895d49b5e..df1de21dab5c0 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -39,7 +39,7 @@ ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
 RUN cargo binstall -y --no-symlinks cargo-llvm-cov cargo-nextest cargo-udeps cargo-hakari cargo-sort cargo-make cargo-cache cargo-audit \
     && cargo install sccache --locked \
-    && cargo install sqllogictest-bin --locked \
+    && cargo install --git https://github.com/risinglightdb/sqllogictest-rs --rev dbadddb --bin sqllogictest --locked \
     && cargo cache -a \
     && rm -rf "/root/.cargo/registry/index" \
     && rm -rf "/root/.cargo/registry/cache" \
diff --git a/ci/build-ci-image.sh b/ci/build-ci-image.sh
index 893c52b94b585..ed28d4ad04fc0 100755
--- a/ci/build-ci-image.sh
+++ b/ci/build-ci-image.sh
@@ -13,7 +13,7 @@ cat ../rust-toolchain
 # !!! CHANGE THIS WHEN YOU WANT TO BUMP CI IMAGE !!! #
 #          AND ALSO docker-compose.yml               #
 ######################################################
-export BUILD_ENV_VERSION=v20230609
+export BUILD_ENV_VERSION=v20230531
 
 export BUILD_TAG="public.ecr.aws/x5u3w5h6/rw-build-env:${BUILD_ENV_VERSION}"
 
diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
index 1ea3f7e193a8e..185b2dac6de6b 100644
--- a/ci/docker-compose.yml
+++ b/ci/docker-compose.yml
@@ -70,7 +70,7 @@ services:
       retries: 5
 
   source-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230609
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230531
     depends_on:
       - mysql
       - db
@@ -79,7 +79,7 @@ services:
       - ..:/risingwave
 
   sink-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230609
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230531
     depends_on:
       - mysql
       - db
@@ -87,12 +87,12 @@ services:
       - ..:/risingwave
 
   rw-build-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230609
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230531
     volumes:
       - ..:/risingwave
 
   ci-flamegraph-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230609
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230531
     # NOTE(kwannoel): This is used in order to permit
     # syscalls for `nperf` (perf_event_open),
     # so it can do CPU profiling.
@@ -103,7 +103,7 @@ services:
       - ..:/risingwave
 
   regress-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230609
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230531
     depends_on:
       db:
         condition: service_healthy
diff --git a/ci/scripts/run-e2e-test.sh b/ci/scripts/run-e2e-test.sh
index df138a3a4ce3f..1ffcf56faee7e 100755
--- a/ci/scripts/run-e2e-test.sh
+++ b/ci/scripts/run-e2e-test.sh
@@ -50,13 +50,13 @@ sqllogictest -p 4566 -d test './e2e_test/database/test.slt'
 echo "--- e2e, ci-3streaming-2serving-3fe, python udf"
 python3 e2e_test/udf/test.py &
 sleep 2
-sqllogictest -p 4566 -d dev --label python './e2e_test/udf/python.slt'
+sqllogictest -p 4566 -d dev './e2e_test/udf/udf.slt'
 pkill python3
 
 echo "--- e2e, ci-3streaming-2serving-3fe, java udf"
 java -jar risingwave-udf-example.jar &
 sleep 2
-sqllogictest -p 4566 -d dev --label java './e2e_test/udf/python.slt'
+sqllogictest -p 4566 -d dev './e2e_test/udf/udf.slt'
 pkill java
 
 echo "--- Kill cluster"
diff --git a/e2e_test/udf/python.slt b/e2e_test/udf/udf.slt
similarity index 98%
rename from e2e_test/udf/python.slt
rename to e2e_test/udf/udf.slt
index 8b718628354c7..10a0370aa7853 100644
--- a/e2e_test/udf/python.slt
+++ b/e2e_test/udf/udf.slt
@@ -1,5 +1,7 @@
 # Before running this test:
 #   python3 e2e_test/udf/test.py
+# or:
+#   cd src/udf/java && mvn package && java -jar target/risingwave-udf-example.jar
 
 # Create a function.
 statement ok