diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index e357e48ba..05fd071b2 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -36,7 +36,7 @@ jobs:
           - '-Pspark-3.0'
           - '-Pspark-3.0 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.1 -Dspark.archive.name=spark-3.1.1-bin-hadoop2.7.tgz -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.DataLakeTest'
           - '-Pspark-3.1'
-          - '-Pspark-3.1 -Dhadoop.binary.version=3.2'
+          - '-Pspark-3.1 -Pspark-hadoop-3.2'
           - '-Pspark-3.2-snapshot -pl :kyuubi-spark-sql-engine,:kyuubi-common,:kyuubi-ha,:kyuubi-zookeeper -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.DataLakeTest'
     env:
       SPARK_LOCAL_IP: localhost
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 805e63f74..5ca95054f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,14 +34,14 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: '1.8'
-      - name: Make Distribution -Pspark-3.0
-        run: ./build/dist --tgz -Pspark-3.0
-      - name: Make Distribution -Pspark-3.0 -Dhadoop.binary.version=3.2
-        run: ./build/dist --tgz -Pspark-3.0 -Dhadoop.binary.version=3.2
-      - name: Make Distribution -Pspark-3.1
-        run: ./build/dist --tgz -Pspark-3.1
-      - name: Make Distribution -Pspark-3.1 -Dhadoop.binary.version=3.2
-        run: ./build/dist --tgz -Pspark-3.1 -Dhadoop.binary.version=3.2
+      - name: Make Distribution -Pspark-3.0 -Pspark-hadoop-2.7
+        run: ./build/dist --tgz -Pspark-3.0 -Pspark-hadoop-2.7
+      - name: Make Distribution -Pspark-3.0 -Pspark-hadoop-3.2
+        run: ./build/dist --tgz -Pspark-3.0 -Pspark-hadoop-3.2
+      - name: Make Distribution -Pspark-3.1 -Pspark-hadoop-2.7
+        run: ./build/dist --tgz -Pspark-3.1 -Pspark-hadoop-2.7
+      - name: Make Distribution -Pspark-3.1 -Pspark-hadoop-3.2
+        run: ./build/dist --tgz -Pspark-3.1 -Pspark-hadoop-3.2
       - name: Make Distribution --spark-provided
         run: ./build/dist --tgz --spark-provided
       - name: Create Release
diff --git a/.travis.yml b/.travis.yml
index 5a979ac02..4545742bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,9 +36,9 @@ matrix:
       env:
         - PROFILE="-Pspark-3.1"
         - EXCLUDE_TAGS="org.apache.kyuubi.tags.DataLakeTest"
-    - name: Test Kyuubi w/ -Pspark-3.1 -Dhadoop.binary.version=3.2
+    - name: Test Kyuubi w/ -Pspark-3.1 -Pspark-hadoop-3.2
       env:
-        - PROFILE="-Pspark-3.1 -Dhadoop.binary.version=3.2"
+        - PROFILE="-Pspark-3.1 -Dspark-hadoop-3.2"
         - EXCLUDE_TAGS="org.apache.kyuubi.tags.DataLakeTest"
     - name: Test Kyuubi w/ -Pspark-3.0 w/ Spark 3.1 distribution
       env:
diff --git a/pom.xml b/pom.xml
index 17ed9c94f..fafff5959 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1442,11 +1442,14 @@
             <id>spark-3.1</id>
             <properties>
                 <spark.version>3.1.1</spark.version>
-                <hadoop.binary.version>2.7</hadoop.binary.version>
                 <maven.plugin.scalatest.exclude.tags>org.apache.kyuubi.tags.DataLakeTest</maven.plugin.scalatest.exclude.tags>
             </properties>
         </profile>
 
+        <profile>
+            <id>spark-hadoop-2.7</id>
+        </profile>
+
         <profile>
             <id>spark-hadoop-3.2</id>
             <properties>