diff --git a/build.gradle b/build.gradle
index 7cf554de17..35f74b82e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,8 +31,6 @@ plugins {
 	id 'org.jetbrains.gradle.plugin.idea-ext' version '0.5'
 	id 'eclipse'
 
-	id 'me.champeau.buildscan-recipes' version '0.2.3'
-
 	id 'org.hibernate.build.xjc' version '2.0.1' apply false
 	id 'biz.aQute.bnd' version '5.1.1' apply false
 }
@@ -165,15 +163,6 @@ wrapper {
 }
 
 
-buildScan {
-	termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-	termsOfServiceAgree = 'yes'
-}
-
-buildScanRecipes {
-	recipe 'git-commit', baseUrl: 'https://github.com/hibernate/hibernate-orm/tree'
-}
-
 idea {
 //    project {
 //		jdkName = gradle.ext.baselineJavaVersion
diff --git a/gradle/gradle-enterprise.gradle b/gradle/gradle-enterprise.gradle
index ee9445730c..bb04714ffa 100644
--- a/gradle/gradle-enterprise.gradle
+++ b/gradle/gradle-enterprise.gradle
@@ -17,14 +17,9 @@ gradleEnterprise {
         termsOfServiceAgree = 'yes'
 
         captureTaskInputFiles = true
-        uploadInBackground = true
 
-        if ( System.properties.CI == true ) {
-            // always publish build-scans and upload the scans immediately
-            publishAlways()
-            uploadInBackground = false
-            tag 'ci'
-        }
+        publishAlways()
+        uploadInBackground = System.getenv("CI") == null && System.getProperty("CI") == null
 
         value 'database', rootProject.hasProperty( 'db' ) ? rootProject.properties.db : 'h2'
     }