diff --git a/Dockerfile b/Dockerfile
index e47e6b347df..580cd45e38a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,8 +43,7 @@ RUN apk add --no-cache bash openssh ca-certificates jq curl openssl perl git zip
 ARG JP_VERSION="0.1.3"
 
 RUN curl -L https://github.com/jmespath/jp/releases/download/${JP_VERSION}/jp-linux-amd64 -o /usr/local/bin/jp \
- && chmod +x /usr/local/bin/jp \
- && pip install --no-cache-dir --upgrade jmespath-terminal
+ && chmod +x /usr/local/bin/jp
 
 WORKDIR azure-cli
 COPY . /azure-cli
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ab0971455ae..a1ee0b86478 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -52,6 +52,7 @@ jobs:
       inputs:
         toolMajorVersion: V2
         suppressionsFile: './scripts/ci/credscan/CredScanSuppressions.json'
+        toolVersionV2: '2.1.17'
     - task: ms-codeanalysis.vss-microsoft-security-code-analysis-devops.build-task-postanalysis.PostAnalysis@1
       displayName: 'Post Analysis'
       inputs:
@@ -743,9 +744,10 @@ jobs:
        YUM_FILE=$SYSTEM_ARTIFACTSDIRECTORY/yum/$YUM_NAME
 
        echo "== Test yum package on CentOS =="
-
-       docker pull centos:centos8
-       docker run --rm -e YUM_NAME=$YUM_NAME -v $SYSTEM_ARTIFACTSDIRECTORY/yum:/mnt/yum -v $(pwd):/azure-cli centos:centos8 /bin/bash "/azure-cli/scripts/release/rpm/test_rpm_in_docker.sh"
+      
+       IMAGE=centos:centos7
+       docker pull $IMAGE
+       docker run --rm -e YUM_NAME=$YUM_NAME -v $SYSTEM_ARTIFACTSDIRECTORY/yum:/mnt/yum -v $(pwd):/azure-cli $IMAGE /bin/bash "/azure-cli/scripts/release/rpm/test_rpm_in_docker.sh"
 
     displayName: 'Test Yum Package'
 
diff --git a/scripts/release/rpm/test_rpm_in_docker.sh b/scripts/release/rpm/test_rpm_in_docker.sh
index b0d17cc5e7a..9804a04209a 100644
--- a/scripts/release/rpm/test_rpm_in_docker.sh
+++ b/scripts/release/rpm/test_rpm_in_docker.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# This script should be run in a centos8 docker.
+# This script should be run in a centos7 docker.
 set -exv
 
 export USERNAME=azureuser
@@ -9,8 +9,8 @@ yum --nogpgcheck localinstall /mnt/yum/$YUM_NAME -y
 
 yum install git gcc python3-devel -y
 
-ln -s /usr/bin/python3 /usr/bin/python
-ln -s /usr/bin/pip3 /usr/bin/pip
+ln -s -f /usr/bin/python3 /usr/bin/python
+ln -s -f /usr/bin/pip3 /usr/bin/pip
 time az self-test
 time az --version