diff --git a/build.gradle b/build.gradle
index bc6fe29..ff50ae2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -266,4 +266,8 @@ task writeActionsTestMatrix() {
 		output.parentFile.mkdir()
 		output.text = json
 	}
+}
+
+tasks.named('wrapper') {
+	distributionType = Wrapper.DistributionType.ALL
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e5338d3..d435ce2 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.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java b/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
index 5d77c0d..5ea09a1 100644
--- a/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
+++ b/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
@@ -81,7 +81,7 @@ public class LoomRepositoryPlugin implements Plugin<PluginAware> {
 		repositories.ivy(repo -> {
 			repo.setUrl(cache.getUserCache());
 			repo.patternLayout(layout -> {
-				layout.artifact("[revision]/[artifact]-[revision](.[ext])");
+				layout.artifact("[revision]/[artifact]-[revision](-[classifier])(.[ext])");
 			});
 			repo.metadataSources(IvyArtifactRepository.MetadataSources::artifact);
 		});
@@ -90,7 +90,7 @@ public class LoomRepositoryPlugin implements Plugin<PluginAware> {
 		repositories.ivy(repo -> {
 			repo.setUrl(cache.getRootPersistentCache());
 			repo.patternLayout(layout -> {
-				layout.artifact("[revision]/[artifact]-[revision](.[ext])");
+				layout.artifact("[revision]/[artifact]-[revision](-[classifier])(.[ext])");
 			});
 			repo.metadataSources(IvyArtifactRepository.MetadataSources::artifact);
 		});
diff --git a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
index fdb70c9..2d0640a 100644
--- a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
@@ -29,7 +29,7 @@ import org.gradle.testkit.runner.GradleRunner
 
 trait ProjectTestTrait {
 	final static String DEFAULT_GRADLE = "7.0.1"
-	final static String PRE_RELEASE_GRADLE = "7.1-20210520220048+0000"
+	final static String PRE_RELEASE_GRADLE = "7.2-20210527220045+0000"
 
 	static File gradleHome = File.createTempDir()
 	File testProjectDir = File.createTempDir()