diff --git a/build.gradle b/build.gradle
index 31a6bbc..c0b3631 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,9 +64,8 @@ buildExtension.enabled = false
 defaultTasks 'createDistribution'
 
 task createDistribution (type: Zip) {
-	baseName "${project.name}-${project.version}-${getGitHash()}-Ghidra_${ghidra_version}".replace(' ', '_')
-	extension 'zip'
-	destinationDir DISTRIBUTION_DIR
+	archiveBaseName.set("${project.name}-${project.version}-${getGitHash()}-Ghidra_${ghidra_version}".replace(' ', '_'))
+	destinationDirectory = DISTRIBUTION_DIR
 	version ''
 
 	// Make sure that we don't try to copy the same file with the same path into the
@@ -111,6 +110,6 @@ task createDistribution (type: Zip) {
 	}
 
 	doLast {
-		println "\nCreated " + baseName + "." + extension + " in " + destinationDir
+		println "\nCreated ${archiveFileName.get()} in ${destinationDirectory.get()}"
 	}
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661..a595206 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists