diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 21be1cc..bd64722 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,9 @@ on:
   # This workflow will be triggered in the mmtk-core CI to make sure mmtk-core can build with the docker image.
   workflow_dispatch:
 
+env:
+  OPENJDK_BINDING_VERSION: "jdk-21"
+
 jobs:
   build-mmtk-core:
     runs-on: ubuntu-latest
@@ -28,10 +31,12 @@ jobs:
       - name: Build OpenJDK
         run: |
           docker run mmtk-dev bash -c "\
-            git clone https://github.com/mmtk/mmtk-openjdk.git && \
-            git clone https://github.com/mmtk/openjdk.git && \
+            git clone -b ${{ env.OPENJDK_BINDING_VERSION }} https://github.com/mmtk/mmtk-openjdk.git && \
+            cd mmtk-openjdk && \
+            .github/scripts/ci-checkout.sh && \
+            cd .. && \
             export MMTK_OPENJDK_PATH=\$(realpath mmtk-openjdk) && \
-            cd openjdk && \
+            cd mmtk-openjdk/repos/openjdk && \
             export DEBUG_LEVEL=slowdebug && \
             sh configure --disable-warnings-as-errors --with-debug-level=\$DEBUG_LEVEL && \
-            make CONF=linux-x86_64-normal-server-\$DEBUG_LEVEL THIRD_PARTY_HEAP=\$MMTK_OPENJDK_PATH/openjdk"
+            make CONF=linux-x86_64-server-\$DEBUG_LEVEL THIRD_PARTY_HEAP=\$MMTK_OPENJDK_PATH/openjdk"
diff --git a/Dockerfile b/Dockerfile
index 3740af3..c20a794 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ ENV LANG en_US.utf8
 RUN apt-get update -y
 
 #install the required packages
-RUN apt-get install wget curl git python3 openjdk-8-jdk openjdk-11-jdk ant autoconf bison pkg-config zip unzip build-essential gettext gcc-multilib libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libxrandr-dev libcups2-dev libasound2-dev libfontconfig1-dev libtool -y && apt-get clean
+RUN apt-get install wget curl git python3 openjdk-21-jdk ant autoconf bison pkg-config zip unzip build-essential gettext gcc-multilib libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libxrandr-dev libcups2-dev libasound2-dev libfontconfig1-dev libtool -y && apt-get clean
 
 # get rust toolchain version
 RUN wget https://raw.githubusercontent.com/mmtk/mmtk-core/master/rust-toolchain