diff --git a/gradle/build-scan.gradle b/gradle/build-scan.gradle
index 801cd72f8e19b..530725ce6dfb0 100644
--- a/gradle/build-scan.gradle
+++ b/gradle/build-scan.gradle
@@ -40,6 +40,9 @@ buildScan {
 
   // Jenkins-specific build scan metadata
   if (jenkinsUrl) {
+    // Disable async upload in CI to ensure scan upload completes before CI agent is terminated
+    uploadInBackground = false
+
     // Parse job name in the case of matrix builds
     // Matrix job names come in the form of "base-job-name/matrix_param1=value1,matrix_param2=value2"
     def splitJobName = jobName.split('/')
diff --git a/settings.gradle b/settings.gradle
index c802b44ba84b8..0e98d6ff02552 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.gradle.enterprise" version "3.2"
+  id "com.gradle.enterprise" version "3.3"
 }
 
 String dirName = rootProject.projectDir.name