diff --git a/build.gradle b/build.gradle
index 88a2ee63c..a4bf29ff2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,8 @@ dependencies {
 
 tasks.named('zipAggregation').configure {
     archiveFileName.unset();
-    archiveBaseName.set("elasticsearch-maven-aggregration")
+    archiveBaseName.set("elasticsearch-hadoop-maven-aggregation")
+    destinationDirectory.set(layout.buildDirectory.dir("distributions"));
     archiveVersion.set(VersionProperties.elasticsearch)
 }
 
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index f29b691c8..a6cc1ac09 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -72,7 +72,7 @@ dependencies {
     // Required for dependency licenses task
     implementation 'org.apache.rat:apache-rat:0.11'
     implementation 'commons-codec:commons-codec:1.12'
-    implementation 'com.gradleup.nmcp:nmcp:0.1.4'
+    implementation 'com.gradleup.nmcp:nmcp:0.1.5'
 
     if (localRepo) {
         implementation name: "build-tools-${buildToolsVersion}"