diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 278a3f09f99f6..3886bb8b77e00 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -19,7 +19,7 @@ trigger:
       - '*'  # must quote since "*" is a YAML reserved character; we want a string
 
 pool:
-  vmImage: 'ubuntu-18.04'
+  vmImage: 'ubuntu-22.04'
 
 parameters:
   - name: job1Modules
diff --git a/hudi-spark-datasource/hudi-spark/pom.xml b/hudi-spark-datasource/hudi-spark/pom.xml
index 91e06f0a922fd..c246200465816 100644
--- a/hudi-spark-datasource/hudi-spark/pom.xml
+++ b/hudi-spark-datasource/hudi-spark/pom.xml
@@ -274,11 +274,27 @@
       <scope>test</scope>
     </dependency>
 
+    <!-- Adding xbean-asm6-shaded as direct dependency and excluding it
+    from spark-core. The dependency in spark-core leads to Azure CI failure
+    with Ubuntu upgrade. Please see issue
+    https://issues.apache.org/jira/browse/HUDI-4827-->
+    <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-asm6-shaded</artifactId>
+      <version>4.10</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>
       <classifier>tests</classifier>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.xbean</groupId>
+          <artifactId>xbean-asm6-shaded</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>