diff --git a/buildSrc/src/main/resources/minimumGradleVersion b/buildSrc/src/main/resources/minimumGradleVersion
index 1f2be2a26c7b7..124bfa22daadf 100644
--- a/buildSrc/src/main/resources/minimumGradleVersion
+++ b/buildSrc/src/main/resources/minimumGradleVersion
@@ -1 +1 @@
-6.3
\ No newline at end of file
+6.4
\ No newline at end of file
diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java b/buildSrc/src/test/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java
index 179cce23bce75..e216c123001e3 100644
--- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java
+++ b/buildSrc/src/test/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java
@@ -24,12 +24,12 @@
 /**
  * Filter out threads controlled by gradle that may be created during unit tests.
  *
- * Currently this is only the pooled threads for Exec.
+ * Currently this includes pooled threads for Exec as well as file system event watcher threads.
  */
 public class GradleThreadsFilter implements ThreadFilter {
 
     @Override
     public boolean reject(Thread t) {
-        return t.getName().startsWith("Exec process");
+        return t.getName().startsWith("Exec process") || t.getName().startsWith("File watcher consumer");
     }
 }
diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle
index 1a98e1193bb0a..e2cc7f09eeb1d 100644
--- a/distribution/packages/build.gradle
+++ b/distribution/packages/build.gradle
@@ -52,7 +52,7 @@ import java.util.regex.Pattern
  */
 
 plugins {
-  id "nebula.ospackage-base" version "8.1.0"
+  id "nebula.ospackage-base" version "8.3.0"
 }
 
 void addProcessFilesTask(String type, boolean oss, boolean jdk) {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 490fda8577df6..62d4c053550b9 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 900fd2c0ce42e..d19365374c27e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=0f316a67b971b7b571dac7215dcf2591a30994b3450e0629925ffcfe2c68cc5c
+distributionSha256Sum=d08f7e24d061910382c2fda9915e6ed42dd1480ae2e99211f92c70190cb697e0
diff --git a/gradlew b/gradlew
index 2fe81a7d95e4f..fbd7c515832da 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 9109989e3cbf6..a9f778a7a964b 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%