diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 162be4219..b133963e5 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -249,6 +249,7 @@ export CDP_HBASE_VERSION=2.4.17.7.3.1.500-30
 export CDP_HIVE_VERSION=3.1.3000.7.3.1.500-30
 export CDP_ICEBERG_VERSION=1.3.1.7.3.1.500-30
 export CDP_KNOX_VERSION=2.0.0.7.3.1.500-30
+export CDP_ORC_JAVA_VERSION=1.8.3.7.3.1.500-30
 export CDP_OZONE_VERSION=1.4.0.7.3.1.500-30
 export CDP_PARQUET_VERSION=1.12.3.7.3.1.500-30
 export CDP_RANGER_VERSION=2.4.0.7.3.1.500-30
@@ -262,6 +263,7 @@ export APACHE_HADOOP_VERSION=3.4.1
 export APACHE_HBASE_VERSION=2.6.0
 export APACHE_ICEBERG_VERSION=1.4.3
 export APACHE_KNOX_VERSION=1.6.1
+export APACHE_ORC_JAVA_VERSION=1.7.6
 export APACHE_PARQUET_VERSION=1.12.3
 export APACHE_RANGER_VERSION=2.4.0
 export APACHE_TEZ_VERSION=0.10.2
@@ -283,7 +285,6 @@ export IMPALA_JACKSON_DATABIND_VERSION=2.15.3
 export IMPALA_JSON_SMART_VERSION=2.4.11
 export IMPALA_JUNIT_VERSION=4.12
 export IMPALA_KITE_VERSION=1.1.0
-export IMPALA_ORC_JAVA_VERSION=1.7.6
 export IMPALA_PAC4J_VERSION=4.5.5
 export IMPALA_RELOAD4j_VERSION=1.2.22
 export IMPALA_SLF4J_VERSION=2.0.13
@@ -388,6 +389,7 @@ if ${USE_APACHE_COMPONENTS:=false}; then
   export IMPALA_HBASE_VERSION=${APACHE_HBASE_VERSION}
   export IMPALA_ICEBERG_VERSION=${APACHE_ICEBERG_VERSION}
   export IMPALA_KNOX_VERSION=${APACHE_KNOX_VERSION}
+  export IMPALA_ORC_JAVA_VERSION=${APACHE_ORC_JAVA_VERSION}
   export IMPALA_OZONE_VERSION=${APACHE_OZONE_VERSION}
   export IMPALA_PARQUET_VERSION=${APACHE_PARQUET_VERSION}
   export IMPALA_RANGER_VERSION=${RANGER_VERSION_OVERRIDE:-"$APACHE_RANGER_VERSION"}
@@ -407,6 +409,7 @@ else
   export IMPALA_ICEBERG_VERSION=${CDP_ICEBERG_VERSION}
   export IMPALA_ICEBERG_URL=${CDP_ICEBERG_URL-}
   export IMPALA_KNOX_VERSION=${CDP_KNOX_VERSION}
+  export IMPALA_ORC_JAVA_VERSION=${CDP_ORC_JAVA_VERSION}
   export IMPALA_OZONE_VERSION=${CDP_OZONE_VERSION}
   export IMPALA_PARQUET_VERSION=${CDP_PARQUET_VERSION}
   export IMPALA_RANGER_VERSION=${RANGER_VERSION_OVERRIDE:-"$CDP_RANGER_VERSION"}
@@ -1240,6 +1243,7 @@ echo "IMPALA_PARQUET_VERSION  = $IMPALA_PARQUET_VERSION"
 echo "IMPALA_HIVE_VERSION     = $IMPALA_HIVE_VERSION"
 echo "IMPALA_TEZ_VERSION      = $IMPALA_TEZ_VERSION"
 echo "IMPALA_HBASE_VERSION    = $IMPALA_HBASE_VERSION"
+echo "IMPALA_ORC_JAVA_VERSION = $IMPALA_ORC_JAVA_VERSION"
 echo "IMPALA_OZONE_VERSION    = $IMPALA_OZONE_VERSION"
 echo "IMPALA_HUDI_VERSION     = $IMPALA_HUDI_VERSION"
 echo "IMPALA_KUDU_VERSION     = $IMPALA_KUDU_VERSION"
diff --git a/fe/pom.xml b/fe/pom.xml
index 6b323fb89..05baf8aac 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -192,6 +192,11 @@ under the License.
           <groupId>org.apache.hive</groupId>
           <artifactId>*</artifactId>
         </exclusion>
+        <!-- Rely on unshaded jars we already include rather than client jars. -->
+        <exclusion>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-client-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>