diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd6adcd7..9d9f5d0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 # [2100.1.5]
 
+### Changed
+* FTB Quests items are now registered to the `FTB Suite` creative tab instead of FTB Quests own tab
+  * In practice, this means they share a tab with other FTB mods, but only FTB Filter System registers an item at this time
+
 ### Fixed
 * Rotated images now have a correctly rotated hitbox
   * In addition, rotated images with a non-default aspect ratio now preview correctly during rotation
diff --git a/fabric/build.gradle b/fabric/build.gradle
index eea54bc3..eff50b68 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -43,7 +43,12 @@ processResources {
 	inputs.property "version", project.version
 
 	filesMatching("fabric.mod.json") {
-		expand "version": project.version
+		expand "version": project.version,
+				"archversion": project.architectury_api_version,
+				"fabricapiversionrange": project.fabric_api_version_range,
+				"mcversion": project.minecraft_version,
+				"ftblibraryversion": project.ftb_library_version,
+				"ftbteamsversion": project.ftb_teams_version
 	}
 }
 
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index d1c002a9..dea32aa8 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -24,11 +24,11 @@
 		"ftbquests-fabric.mixins.json"
 	],
 	"depends": {
-		"fabric": "*",
-		"minecraft": "~1.21",
-		"architectury": ">=13.0.0",
-		"ftblibrary": ">=2100.1.0",
-		"ftbteams": ">=2100.1.0"
+		"fabric": "${fabricapiversionrange}",
+		"minecraft": "~${mcversion}",
+		"architectury": ">=${archversion}",
+		"ftblibrary": ">=${ftblibraryversion}",
+		"ftbteams": ">=${ftbteamsversion}"
 	},
 	"breaks": {
 	}
diff --git a/gradle.properties b/gradle.properties
index 7c6e669c..d7f1d513 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,12 +16,13 @@ minecraft_version=1.21
 # Cross env
 #forge_version=50.0.9
 #forge_loader_version=49
-neoforge_version=21.0.40-beta
-# https://maven.neoforged.net/#/releases/net/neoforged/fancymodloader/loader
+neoforge_version=21.0.146
+neoforge_version_range=[21.0.143,)
 neoforge_loader_version=4
 fabric_loader_version=0.15.11
-fabric_api_version=0.100.1+1.21
-architectury_api_version=13.0.2
+fabric_api_version=0.100.8+1.21
+fabric_api_version_range=>=0.100.1+1.21
+architectury_api_version=13.0.6
 
 ftb_library_version=2100.1.4
 ftb_teams_version=2100.1.0
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index 39bfe5b2..c86d093b 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -44,7 +44,7 @@ processResources {
 	filesMatching("META-INF/neoforge.mods.toml") {
 		expand "version": project.version,
 			"archversion": project.architectury_api_version,
-			"neoforgeversion": project.neoforge_version,
+			"neoforgeversionrange": project.neoforge_version_range,
 			"neoforgeloaderversion": project.neoforge_loader_version,
 			"mcversion": project.minecraft_version,
 			"ftblibraryversion": project.ftb_library_version,
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
index e41f6fed..07065561 100644
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -18,7 +18,7 @@ Lets you easily create and play with quests
 [[dependencies.ftbquests]]
 modId = "neoforge"
 type = "required"
-versionRange = "[${neoforgeversion},)"
+versionRange = "${neoforgeversionrange}"
 ordering = "NONE"
 side = "BOTH"