diff --git a/Ghidra/RuntimeScripts/build.gradle b/Ghidra/RuntimeScripts/build.gradle
index 317554e26e..5ac3930e8f 100644
--- a/Ghidra/RuntimeScripts/build.gradle
+++ b/Ghidra/RuntimeScripts/build.gradle
@@ -41,7 +41,7 @@ rootProject.assembleMarkdownToHtml {
 }
 
 rootProject.PLATFORMS.each { platform ->
-	rootProject.tasks.findAll {it.name == "assembleDistribution_${platform.name}"}.each { t -> 
+	rootProject.tasks.matching {it.name == "assembleDistribution_${platform.name}"}.each { t -> 
 		def p = this.project
 
 		if (isLinux(platform.name) || isMac(platform.name)) {
diff --git a/gradle/distributableGhidraModule.gradle b/gradle/distributableGhidraModule.gradle
index 89c3813687..0638f1ec91 100644
--- a/gradle/distributableGhidraModule.gradle
+++ b/gradle/distributableGhidraModule.gradle
@@ -113,7 +113,7 @@ rootProject.assembleDistribution {
 
 // copy os specific files for each platform
 rootProject.PLATFORMS.each { platform ->
-	rootProject.tasks.findAll {it.name == "assembleDistribution_${platform.name}"}.each { t -> 
+	rootProject.tasks.matching {it.name == "assembleDistribution_${platform.name}"}.each { t -> 
 
 		def p = this.project
 		
@@ -225,7 +225,7 @@ rootProject.assembleMarkdownToHtml {
 /////////////////////////////////////////////////////////////////////////////	
 plugins.withType(CPlugin) {
 	rootProject.PLATFORMS.each { platform ->
-		rootProject.tasks.findAll {it.name == "assembleDistribution_${platform.name}"}.each { t -> 
+		rootProject.tasks.matching {it.name == "assembleDistribution_${platform.name}"}.each { t -> 
 			t.dependsOn this.assemble
 		}
 	}