diff --git a/build.gradle b/build.gradle
index 28602f284..d1602a579 100755
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ subprojects {
     tasks.withType(JavaCompile).configureEach {
         it.options.encoding = "UTF-8"
 
-        def targetVersion = 16
+        def targetVersion = 17
         if (JavaVersion.current().isJava9Compatible()) {
             it.options.release = targetVersion
         }
diff --git a/src/launch/resources/mixins.baritone.json b/src/launch/resources/mixins.baritone.json
index 4b9ea4c91..eb461292f 100644
--- a/src/launch/resources/mixins.baritone.json
+++ b/src/launch/resources/mixins.baritone.json
@@ -2,6 +2,7 @@
   "required": true,
   "package": "baritone.launch.mixins",
   "compatibilityLevel": "JAVA_17",
+  "refmap": "baritone-common-refmap.json",
   "verbose": false,
   "injectors": {
     "maxShiftBy": 2,
diff --git a/tweaker/build.gradle b/tweaker/build.gradle
index cb76d7a4d..f6b114841 100644
--- a/tweaker/build.gradle
+++ b/tweaker/build.gradle
@@ -8,6 +8,7 @@ architectury {
 loom {
     mixin {
         legacyRemapToNamespace = "official"
+        defaultRefmapName = "baritone-common-refmap.json"
     }
 }