diff --git a/tests/ci/docker_images/linux-x86/ubuntu-20.04_clang-10x_formal-verification/create_image.sh b/tests/ci/docker_images/linux-x86/ubuntu-20.04_clang-10x_formal-verification/create_image.sh
index 068a43641d..f2e4ed4faf 100755
--- a/tests/ci/docker_images/linux-x86/ubuntu-20.04_clang-10x_formal-verification/create_image.sh
+++ b/tests/ci/docker_images/linux-x86/ubuntu-20.04_clang-10x_formal-verification/create_image.sh
@@ -10,6 +10,6 @@ fi
 rm -rf aws-lc-verification
 git clone https://github.com/awslabs/aws-lc-verification.git
 cd aws-lc-verification
-docker build --pull --no-cache -f Dockerfile.saw -t ${docker_tag} .
+docker build --pull --no-cache -f Dockerfile.saw_x86 -t ${docker_tag} .
 cd ..
 rm -rf aws-lc-verification
diff --git a/tests/ci/run_formal_verification.sh b/tests/ci/run_formal_verification.sh
index 6b7af8f7ab..e6c95bc934 100755
--- a/tests/ci/run_formal_verification.sh
+++ b/tests/ci/run_formal_verification.sh
@@ -10,14 +10,12 @@ rm -rf aws-lc-verification-build
 git clone https://github.com/awslabs/aws-lc-verification.git aws-lc-verification-build
 
 cd aws-lc-verification-build
-# We avoid pulling the saw-script submodule since the repo will take forever to clone.
 git submodule update --init
-pushd Coq/fiat-crypto; git submodule update --init --recursive; popd
 
 # aws-lc-verification has aws-lc as one submodule under 'src' dir.
 # Below is to copy code of **target** aws-lc to 'src' dir.
 rm -rf ./src/* && cp -r "${ROOT}/${AWS_LC_DIR}/"* ./src
 # execute the entry to saw scripts.
-./SAW/scripts/docker_entrypoint.sh
+./SAW/scripts/x86_64/docker_entrypoint.sh
 cd ..
 rm -rf aws-lc-verification-build