diff --git a/bootstrap/build.gradle b/bootstrap/build.gradle
index 4083cf1f..8a62397c 100644
--- a/bootstrap/build.gradle
+++ b/bootstrap/build.gradle
@@ -3,14 +3,12 @@ plugins {
 	id 'groovy'
 }
 
-java {
-	toolchain {
-		languageVersion = JavaLanguageVersion.of(8)
-	}
-}
+sourceCompatibility = 8
+targetCompatibility = 8
 
 tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
+	it.options.release = 8
 }
 
 repositories {
diff --git a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
index 2f2fa9f1..7988ec78 100644
--- a/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
+++ b/src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
@@ -81,6 +81,10 @@ public interface LoomGradleExtensionAPI {
 
 	Dependency layered(Action<LayeredMappingSpecBuilder> action);
 
+	/**
+	 * @deprecated Broken due to be evaluated too early. Replaced with "fabric.loom.dontRemap" gradle property.
+	 */
+	@Deprecated(forRemoval = true)
 	Property<Boolean> getRemapArchives();
 
 	void runs(Action<NamedDomainObjectContainer<RunConfigSettings>> action);
@@ -112,13 +116,9 @@ public interface LoomGradleExtensionAPI {
 	Property<String> getCustomMinecraftManifest();
 
 	/**
-	 * If true, Loom will replace the {@code -dev} jars in the {@code *Elements} configurations
-	 * with remapped outgoing variants.
-	 *
-	 * <p>Will only apply if {@link #getRemapArchives()} is also true.
-	 *
-	 * @return the property controlling the setup of remapped variants
+	 * @deprecated Broken due to be evaluated too early. Replaced with "fabric.loom.disableRemappedVariants" gradle property.
 	 */
+	@Deprecated(forRemoval = true)
 	Property<Boolean> getSetupRemappedVariants();
 
 	/**
diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
index 4246aefa..6f7576f5 100644
--- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
+++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
@@ -194,6 +194,7 @@ public final class CompileConfiguration {
 		project.getDependencies().add(Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, Constants.Dependencies.DEV_LAUNCH_INJECTOR + Constants.Dependencies.Versions.DEV_LAUNCH_INJECTOR);
 		project.getDependencies().add(Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, Constants.Dependencies.TERMINAL_CONSOLE_APPENDER + Constants.Dependencies.Versions.TERMINAL_CONSOLE_APPENDER);
 		project.getDependencies().add(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS);
+		project.getDependencies().add(JavaPlugin.TEST_COMPILE_ONLY_CONFIGURATION_NAME, Constants.Dependencies.JETBRAINS_ANNOTATIONS + Constants.Dependencies.Versions.JETBRAINS_ANNOTATIONS);
 
 		if (extension.isForge()) {
 			project.getDependencies().add(Constants.Configurations.FORGE_EXTRA, Constants.Dependencies.FORGE_RUNTIME + Constants.Dependencies.Versions.FORGE_RUNTIME);
@@ -224,8 +225,6 @@ public final class CompileConfiguration {
 			extension.setDependencyManager(dependencyManager);
 			dependencyManager.handleDependencies(project);
 
-			extension.getRemapArchives().finalizeValue();
-
 			MixinExtension mixin = LoomGradleExtension.get(project).getMixin();
 
 			if (mixin.getUseLegacyMixinAp().get()) {
diff --git a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
index a612943b..f62a80c9 100644
--- a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
+++ b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java
@@ -53,7 +53,7 @@ public class RemapTaskConfiguration {
 		final TaskContainer tasks = project.getTasks();
 		final LoomGradleExtension extension = LoomGradleExtension.get(project);
 
-		if (!extension.getRemapArchives().get()) {
+		if (getBooleanProperty(project, "fabric.loom.dontRemap")) {
 			extension.getUnmappedModCollection().from(project.getTasks().getByName(JavaPlugin.JAR_TASK_NAME));
 			return;
 		}
@@ -103,7 +103,7 @@ public class RemapTaskConfiguration {
 			}
 		});
 
-		if (!extension.getSetupRemappedVariants().get()) {
+		if (getBooleanProperty(project, "fabric.loom.disableRemappedVariants")) {
 			return;
 		}
 
@@ -154,7 +154,7 @@ public class RemapTaskConfiguration {
 
 		tasks.named(BasePlugin.ASSEMBLE_TASK_NAME).configure(task -> task.dependsOn(remapSourcesTask));
 
-		if (!extension.getSetupRemappedVariants().get()) {
+		if (getBooleanProperty(project, "fabric.loom.disableRemappedVariants")) {
 			return;
 		}
 
@@ -177,4 +177,15 @@ public class RemapTaskConfiguration {
 			}
 		});
 	}
+
+	private static boolean getBooleanProperty(Project project, String key) {
+		return project.getProviders().gradleProperty(key).map(string -> {
+			try {
+				return Boolean.parseBoolean(string);
+			} catch (final IllegalArgumentException ex) {
+				return false;
+			}
+		})
+		.getOrElse(false);
+	}
 }
diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java
index ea9ac054..5ec77011 100644
--- a/src/main/java/net/fabricmc/loom/util/Constants.java
+++ b/src/main/java/net/fabricmc/loom/util/Constants.java
@@ -38,7 +38,7 @@ public class Constants {
 	public static final String PLUGIN_ID = "dev.architectury.loom";
 	public static final String LIBRARIES_BASE = "https://libraries.minecraft.net/";
 	public static final String RESOURCES_BASE = "https://resources.download.minecraft.net/";
-	public static final String VERSION_MANIFESTS = "https://launchermeta.mojang.com/mc/game/version_manifest_v2.json";
+	public static final String VERSION_MANIFESTS = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json";
 	public static final String EXPERIMENTAL_VERSIONS = "https://maven.fabricmc.net/net/minecraft/experimental_versions.json";
 	public static final String FABRIC_REPOSITORY = "https://maven.fabricmc.net/";