diff --git a/build.gradle b/build.gradle
index 340081e67d..45dbae7006 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,8 +14,8 @@ buildscript {
 		classpath 'de.undercouch:gradle-download-task:4.0.4'
 		classpath 'net.fabricmc:tiny-remapper:0.3.1.72'
 		classpath 'net.fabricmc:mappingpoet:0.1.0+build.2'
-		classpath 'net.fabricmc.unpick:unpick:2.1.0'
-		classpath 'net.fabricmc.unpick:unpick-format-utils:2.1.0'
+		classpath "net.fabricmc.unpick:unpick:${project.unpick_version}"
+		classpath "net.fabricmc.unpick:unpick-format-utils:${project.unpick_version}"
 	}
 }
 
@@ -68,7 +68,6 @@ configurations {
 }
 
 def unpickMetaFile = file("unpick-definitions/unpick.json")
-def unpickMeta = new groovy.json.JsonSlurper().parseText(unpickMetaFile.text)
 
 dependencies {
 	enigmaRuntime "cuchaz:enigma-swing:${project.enigma_version}"
@@ -77,7 +76,7 @@ dependencies {
 	javadocClasspath "org.jetbrains:annotations:${project.jetbrains_annotations_version}"
 	decompileClasspath "org.benf:cfr:0.150"
 	mappingPoetJar 'net.fabricmc:mappingpoet:0.2.6'
-	unpick "${unpickMeta.unpickGroup}:unpick-cli:${unpickMeta.unpickVersion}"
+	unpick "net.fabricmc.unpick:unpick-cli:${project.unpick_version}"
 }
 
 def setupGroup = "jar setup"
@@ -822,6 +821,7 @@ task v2UnmergedYarnJar(dependsOn: [insertAutoGeneratedEnumMappings, combineUnpic
 		rename combineUnpickDefinitions.output.name, "extras/definitions.unpick"
 	}
 	from (file(unpickMetaFile)) {
+		expand version: project.unpick_version
 		rename unpickMetaFile.name, "extras/unpick.json"
 	}
 	destinationDirectory.set(file("build/libs"))
@@ -840,6 +840,7 @@ task v2MergedYarnJar(dependsOn: ["mergeV2"], type: Jar) {
 		rename combineUnpickDefinitions.output.name, "extras/definitions.unpick"
 	}
 	from (file(unpickMetaFile)) {
+		expand version: project.unpick_version
 		rename unpickMetaFile.name, "extras/unpick.json"
 	}
 	destinationDirectory.set(file("build/libs"))
diff --git a/gradle.properties b/gradle.properties
index 6a9fdb8e4c..6a0c2e8648 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,6 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 
 enigma_version=0.26.0
 stitch_version=0.5.1+build.77
+unpick_version=2.1.0
 # Loader is only used by javadoc generation/linking
 fabric_loader_version=0.11.1
 jetbrains_annotations_version=20.1.0
diff --git a/unpick-definitions/unpick.json b/unpick-definitions/unpick.json
index 550a8a7c1c..e723897a41 100644
--- a/unpick-definitions/unpick.json
+++ b/unpick-definitions/unpick.json
@@ -1,5 +1,5 @@
 {
   "version": 1,
   "unpickGroup": "net.fabricmc.unpick",
-  "unpickVersion": "2.1.0"
+  "unpickVersion": "${version}"
 }
\ No newline at end of file