diff --git a/Common/build.gradle.kts b/Common/build.gradle.kts
index aa71a25..7f32622 100644
--- a/Common/build.gradle.kts
+++ b/Common/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
     modCompileOnly("mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion") // required for jei plugin
     modCompileOnly("me.shedaniel:RoughlyEnoughItems-api:$reiVersion") // required for rei plugin
     compileOnly("me.shedaniel:REIPluginCompatibilities-forge-annotations:9.+") // required to disable rei compat layer
-    modCompileOnly("dev.emi:emi-xplat-intermediary:$emiVersion+1.21:api") // required for emi plugin TODO: replace on EMI release
+    modCompileOnly("dev.emi:emi-xplat-intermediary:$emiVersion+$minecraftVersion:api") // required for emi plugin
 }
 
 buildConfig {
diff --git a/Fabric/build.gradle.kts b/Fabric/build.gradle.kts
index d91c0a5..c51d321 100644
--- a/Fabric/build.gradle.kts
+++ b/Fabric/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
     // compile time
     modCompileOnly("mezz.jei:jei-$minecraftVersion-fabric-api:$jeiVersion") // required for common jei plugin
     modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:$reiVersion") // required for common rei plugin
-    modCompileOnly("dev.emi:emi-fabric:$emiVersion+1.21:api") // required for common emi plugin TODO: replace on EMI release
+    modCompileOnly("dev.emi:emi-fabric:$emiVersion+$minecraftVersion:api") // required for common emi plugin
 
     // runtime
     if (enableRuntimeRecipeViewer == "true") {
@@ -47,7 +47,7 @@ dependencies {
             when (fabricRecipeViewer) {
                 "jei" -> "mezz.jei:jei-$minecraftVersion-fabric:$jeiVersion"
                 "rei" -> "me.shedaniel:RoughlyEnoughItems-fabric:$reiVersion"
-                "emi" -> "dev.emi:emi-fabric:$emiVersion+1.21" // TODO: replace on EMI release
+                "emi" -> "dev.emi:emi-fabric:$emiVersion+$minecraftVersion"
                 else -> throw GradleException("Invalid fabricRecipeViewer value: $fabricRecipeViewer")
             }
         )
diff --git a/NeoForge/build.gradle.kts b/NeoForge/build.gradle.kts
index 5885a53..11bc2ed 100644
--- a/NeoForge/build.gradle.kts
+++ b/NeoForge/build.gradle.kts
@@ -64,8 +64,7 @@ dependencies {
     }
     // TODO go back to API when solved: https://github.com/architectury/architectury-loom/issues/204
     modCompileOnly("me.shedaniel:RoughlyEnoughItems-neoforge:$reiVersion") // required for common rei plugin
-    modLocalRuntime("dev.architectury:architectury-neoforge:13.0.6") // TODO: Remove on new REI version
-    modCompileOnly("dev.emi:emi-neoforge:$emiVersion+1.21:api") // required for common emi plugin TODO: replace on EMI release
+    modCompileOnly("dev.emi:emi-neoforge:$emiVersion+$minecraftVersion:api") // required for common emi plugin
 
     // runtime
     forgeRuntimeLibrary("org.junit.jupiter:junit-jupiter-api:$junitVersion")
@@ -73,7 +72,7 @@ dependencies {
         when (neoforgeRecipeViewer) {
             "jei" -> modLocalRuntime("mezz.jei:jei-$minecraftVersion-neoforge:$jeiVersion") { isTransitive = false }
             "rei" -> modLocalRuntime("me.shedaniel:RoughlyEnoughItems-neoforge:$reiVersion")
-            "emi" -> modLocalRuntime("dev.emi:emi-neoforge:$emiVersion+1.21") //TODO: replace on EMI release
+            "emi" -> modLocalRuntime("dev.emi:emi-neoforge:$emiVersion+$minecraftVersion")
             else -> throw GradleException("Invalid forgeRecipeViewer value: $neoforgeRecipeViewer")
         }
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index 0ecb4e5..b381983 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -93,7 +93,7 @@ subprojects {
         "minecraft"("com.mojang:minecraft:$minecraftVersion")
         "mappings"(loom.layered {
             officialMojangMappings()
-            parchment("org.parchmentmc.data:parchment-1.21:$parchmentVersion@zip") // TODO: replace on aprchment update
+            parchment("org.parchmentmc.data:parchment-1.21:$parchmentVersion@zip") // TODO: replace on parchment update
         })
 
         /**
diff --git a/gradle.properties b/gradle.properties
index 0eb71d7..b916840 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,8 +23,8 @@ parchmentVersion = 2024.07.28
 # Recipe Viewers
 enableRuntimeRecipeViewer = true
 jeiVersion = 19.8.4.113
-reiVersion = 16.0.754
-emiVersion = 1.1.10
+reiVersion = 16.0.762
+emiVersion = 1.1.13
 fabricRecipeViewer = rei
 neoforgeRecipeViewer = emi