diff --git a/gradle/base-information.gradle b/gradle/base-information.gradle
index ca5f459cb2..3dc3f1c0e8 100644
--- a/gradle/base-information.gradle
+++ b/gradle/base-information.gradle
@@ -7,6 +7,21 @@
 
 apply plugin: 'base'
 
+
+buildscript {
+	dependencies {
+		constraints {
+			classpath("org.apache.logging.log4j:log4j-core") {
+				version {
+					strictly("[2.17, 3[")
+					prefer("2.17.0")
+				}
+				because("CVE-2021-44228, CVE-2021-45046, CVE-2021-45105: Log4j vulnerable to remote code execution and other critical security vulnerabilities")
+			}
+		}
+	}
+}
+
 ext {
 	ormVersionFile = file("${rootProject.projectDir}/gradle/version.properties")
 
diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index 526654798f..d6f9db3097 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -125,6 +125,17 @@ dependencies {
 	annotationProcessor libraries.logging_processor
 	annotationProcessor libraries.logging
 	annotationProcessor libraries.logging_annotations
+
+
+	constraints {
+		implementation('org.apache.logging.log4j:log4j-core') {
+			version {
+				strictly('[2.17, 3[')
+				prefer('2.17.0')
+			}
+			because('CVE-2021-44228, CVE-2021-45046, CVE-2021-45105: Log4j vulnerable to remote code execution and other critical security vulnerabilities')
+		}
+	}
 }
 
 
diff --git a/settings.gradle b/settings.gradle
index 14b6a4fe5c..4d575e0c74 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,7 +16,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gradle.enterprise' version '3.6.1'
+    id 'com.gradle.enterprise' version '3.8'
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.4.2'
 }