diff --git a/build/buildall b/build/buildall
index 7a50f7569df..01fb186e8cb 100755
--- a/build/buildall
+++ b/build/buildall
@@ -127,6 +127,7 @@ case $DIST_PROFILE in
       303
       304
       311
+      311cdh
       312
       313
       320
@@ -142,6 +143,7 @@ case $DIST_PROFILE in
       302
       303
       311
+      311cdh
       312
       320
       321
@@ -151,6 +153,7 @@ case $DIST_PROFILE in
   minimumFeatureVersionMix)
     SPARK_SHIM_VERSIONS=(
       302
+      311cdh
       312
       320
     )
diff --git a/dist/pom.xml b/dist/pom.xml
index 13ae020ab09..be700826b24 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -56,6 +56,7 @@
             302,
             303,
             311,
+            311cdh,
             312,
             320,
             321
@@ -111,7 +112,8 @@
                 <included_buildvers>
                     302,
                     312,
-                    320
+                    320,
+                    311cdh
                 </included_buildvers>
             </properties>
         </profile>
diff --git a/jenkins/spark-premerge-build.sh b/jenkins/spark-premerge-build.sh
index 8b34252140b..36348ff2975 100755
--- a/jenkins/spark-premerge-build.sh
+++ b/jenkins/spark-premerge-build.sh
@@ -45,6 +45,7 @@ mvn_verify() {
     env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=304 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -pl aggregator -am
     # don't skip tests and build tools module
     env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=311 clean install -Drat.skip=true -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -Dpytest.TEST_TAGS=''
+    env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=311cdh clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -pl aggregator -am
     env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=312 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -pl aggregator -am
     env -u SPARK_HOME mvn -U -B $MVN_URM_MIRROR -Dbuildver=313 clean install -Drat.skip=true -DskipTests -Dmaven.javadoc.skip=true -Dskip -Dmaven.scalastyle.skip=true -Dcuda.version=$CUDA_CLASSIFIER -pl aggregator -am
     # don't skip tests
diff --git a/jenkins/version-def.sh b/jenkins/version-def.sh
index 870700669f1..18c61837313 100755
--- a/jenkins/version-def.sh
+++ b/jenkins/version-def.sh
@@ -49,7 +49,7 @@ echo "CUDF_VER: $CUDF_VER, CUDA_CLASSIFIER: $CUDA_CLASSIFIER, PROJECT_VER: $PROJ
     SPARK_VER: $SPARK_VER, SCALA_BINARY_VER: $SCALA_BINARY_VER"
 
 
-SPARK_SHIM_VERSIONS_STR=${SPARK_SHIM_VERSIONS_STR:-"301 302 303 304 311 312 313 320 321 322 330"}
+SPARK_SHIM_VERSIONS_STR=${SPARK_SHIM_VERSIONS_STR:-"301 302 303 304 311 311cdh 312 313 320 321 322 330"}
 
 IFS=" " <<< $SPARK_SHIM_VERSIONS_STR read -r -a SPARK_SHIM_VERSIONS