diff --git a/.github/workflows/hw_mode_test.yml b/.github/workflows/hw_mode_test.yml
index aac29896..eb142377 100644
--- a/.github/workflows/hw_mode_test.yml
+++ b/.github/workflows/hw_mode_test.yml
@@ -573,13 +573,6 @@ jobs:
         sleep ${{ env.nap_time }};
         docker exec $grpc_test bash -c "cd /root/demos/grpc/grpc_musl && ./run_client_on_occlum.sh"
 
-    - name: Clean the environment
-      if: ${{ always() }}
-      run: docker stop $grpc_test
-
-    - name: Restart the docker
-      run: docker start $grpc_test
-
     - name: Prepare grpc glibc sample project
       run: docker exec $grpc_test bash -c "cd /root/demos/grpc/grpc_glibc && ./prepare_client_server_glibc.sh"
 
@@ -653,8 +646,11 @@ jobs:
     - name: Make install
       run: docker exec $gvisor_test bash -c "source /opt/intel/sgxsdk/environment; cd /root/occlum; OCCLUM_RELEASE_BUILD=y make install"
 
+    - name: Clone gvisor code
+      run: docker exec $gvisor_test bash -c "git clone https://github.com/occlum/gvisor.git"
+
     - name: Run gvisor syscall test
-      run: docker exec $gvisor_test bash -c "cd /root/gvisor_occlum; ./run_occlum_passed_tests.sh"
+      run: docker exec $gvisor_test bash -c "cd /root/gvisor/occlum; ./run_occlum_passed_tests.sh"
 
     - name: Clean the environment
       if: ${{ always() }}
diff --git a/demos/deployment/deploy_image_test.sh b/demos/deployment/deploy_image_test.sh
index 8729beb7..0612edb1 100755
--- a/demos/deployment/deploy_image_test.sh
+++ b/demos/deployment/deploy_image_test.sh
@@ -1,8 +1,8 @@
 #! /bin/bash
 set -xe
 
-if [[ $1 != "ubuntu18.04" && $1 != "centos8.2" ]]; then
-    echo "Must choose between <ubuntu18.04/centos8.2>."
+if [[ $1 != "ubuntu20.04" ]]; then
+    echo "Only ubuntu20.04 is supported."
     exit 1
 fi