diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy
index 97d0cb11a..77919bcc8 100644
--- a/pipelines/build/common/openjdk_build_pipeline.groovy
+++ b/pipelines/build/common/openjdk_build_pipeline.groovy
@@ -1962,8 +1962,16 @@ class Build {
                                 repoHandler.checkoutUserBuild(context)
                                 printGitRepoInfo()
                                 if (buildConfig.VARIANT == "openj9") {
-                                    context.sshagent(['83181e25-eea4-4f55-8b3e-e79615733226']) {
-                                        context.sh(script: "./${DEFAULTS_JSON['scriptDirectories']['buildfarm']}")
+                                    def buildArgs = ''
+                                    if (DEFAULTS_JSON['bundle-openjceplus'] == true) {
+                                        buildArgs = ' --bundle-openjceplus'
+                                    }
+                                    context.withEnv(['BUILD_ARGS=' + buildArgs]) {
+                                        context.sshagent(['83181e25-eea4-4f55-8b3e-e79615733226']) {
+                                            context.withCredentials([usernamePassword(credentialsId: '7c1c2c28-650f-49e0-afd1-ca6b60479546', passwordVariable: 'GSKIT_PASSWORD', usernameVariable: 'GSKIT_USERNAME')]) {
+                                                context.sh(script: "./${DEFAULTS_JSON['scriptDirectories']['buildfarm']}")
+                                            }
+                                        }
                                     }
                                 } else {
                                     context.sh(script: "./${DEFAULTS_JSON['scriptDirectories']['buildfarm']}")
diff --git a/pipelines/defaults.json b/pipelines/defaults.json
index 7d4097461..b7213c355 100644
--- a/pipelines/defaults.json
+++ b/pipelines/defaults.json
@@ -92,6 +92,7 @@
     "enableSourceRpm"        : true,
     "enableSigner"           : true,
     "verifySigner"           : false,
+    "bundle-openjceplus"     : true,
     "importLibraryScript"    : "pipelines/build/common/import_lib.groovy",
     "defaultsUrl"            : "https://raw.githubusercontent.com/ibmruntimes/ci-jenkins-pipelines/ibm/pipelines/defaults.json"
 }