diff --git a/shims/spark311/src/main/scala/com/intel/oap/sql/shims/spark311/SparkShimProvider.scala b/shims/spark311/src/main/scala/com/intel/oap/sql/shims/spark311/SparkShimProvider.scala
index 725788785..7c25a52bf 100644
--- a/shims/spark311/src/main/scala/com/intel/oap/sql/shims/spark311/SparkShimProvider.scala
+++ b/shims/spark311/src/main/scala/com/intel/oap/sql/shims/spark311/SparkShimProvider.scala
@@ -19,8 +19,13 @@ package com.intel.oap.sql.shims.spark311
 import com.intel.oap.sql.shims.{SparkShims, SparkShimDescriptor}
 
 object SparkShimProvider {
-  val DESCRIPTOR = SparkShimDescriptor(3, 1, 1)
-  val DESCRIPTOR_STRINGS = Seq(s"$DESCRIPTOR")
+  // The shim layer for spark 3.1.1 is also workable for 3.1.2 & 3.1.3.
+  val SPARK311_DESCRIPTOR = SparkShimDescriptor(3, 1, 1)
+  val SPARK312_DESCRIPTOR = SparkShimDescriptor(3, 1, 2)
+  val SPARK313_DESCRIPTOR = SparkShimDescriptor(3, 1, 3)
+  val DESCRIPTOR_STRINGS =
+    Seq(s"$SPARK311_DESCRIPTOR", s"$SPARK312_DESCRIPTOR", s"$SPARK313_DESCRIPTOR")
+  val DESCRIPTOR = SPARK311_DESCRIPTOR
 }
 
 class SparkShimProvider extends com.intel.oap.sql.shims.SparkShimProvider {