diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1ee8f8e..927f015 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
     types: [ opened, synchronize, reopened ]
 jobs:
   build:
-    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.15.2
+    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.16.2
     with:
       mutation-testing: false
     secrets: inherit
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
index f731a43..654a116 100644
--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@@ -17,7 +17,7 @@ on:
         type: string
 jobs:
   draft:
-    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.15.2
+    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.16.2
     with:
       release-type: ${{ inputs.release-type }}
       version-number-override: ${{ inputs.version-number-override }}
diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml
index 7eace9c..adf506e 100644
--- a/.github/workflows/issue-for-unsupported-version.yml
+++ b/.github/workflows/issue-for-unsupported-version.yml
@@ -4,4 +4,4 @@ on:
     types: [ labeled, unlabeled, reopened ]
 jobs:
   unsupported-labeler:
-    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.15.2
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.16.2
\ No newline at end of file
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index fa40250..052a8f9 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -7,7 +7,7 @@ on:
       - closed
 jobs:
   publish-release:
-    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.15.2
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.16.2
     secrets: inherit
     with:
       project-name: 'Refined Storage - JEI Integration'
diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml
index f0098dd..0ef64ca 100644
--- a/.github/workflows/resolved-issue-locking.yml
+++ b/.github/workflows/resolved-issue-locking.yml
@@ -4,4 +4,4 @@ on:
     - cron: '0 0 * * *'
 jobs:
   lock:
-    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.15.2
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.2
\ No newline at end of file
diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml
index a5d3c1b..8cc3e40 100644
--- a/.github/workflows/validate-branch-name.yml
+++ b/.github/workflows/validate-branch-name.yml
@@ -2,4 +2,4 @@ name: Validate branch name
 on: [ pull_request ]
 jobs:
   validate-branch-name:
-    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.15.2
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.16.2
\ No newline at end of file
diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml
index 8822e7e..baac7e0 100644
--- a/.github/workflows/validate-changelog.yml
+++ b/.github/workflows/validate-changelog.yml
@@ -4,4 +4,4 @@ on:
     types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ]
 jobs:
   validate-changelog:
-    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.15.2
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.16.2
\ No newline at end of file
diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml
index 194a3e8..30ba6a8 100644
--- a/.github/workflows/validate-commit-messages.yml
+++ b/.github/workflows/validate-commit-messages.yml
@@ -2,4 +2,4 @@ name: Validate commit messages
 on: [ pull_request ]
 jobs:
   validate-commit-messages:
-    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.15.2
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.16.2
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 7f2727d..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v${gradle.ext.refinedArchitectVersion}/helper.gradle"
-
-subprojects {
-    group = 'com.refinedmods.refinedstorage'
-}
-
-enableSonarQube("refinedmods_refinedstorage-jei-integration")
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..bd76951
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    id("refinedarchitect.root")
+}
+
+refinedarchitect {
+    sonarQube("refinedmods_refinedstorage-jei-integration", "refinedmods")
+}
+
+subprojects {
+    group = "com.refinedmods.refinedstorage"
+}
diff --git a/gradle.properties b/gradle.properties
index c5a9518..814872f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,5 @@
 refinedstorageVersion=2.0.0-milestone.4.2
 jeiVersion=19.1.0.17
+minecraftVersion=1.21
 # Gradle
 org.gradle.jvmargs=-Xmx1G
diff --git a/refinedstorage-jei-integration-common/build.gradle b/refinedstorage-jei-integration-common/build.gradle
deleted file mode 100644
index a731684..0000000
--- a/refinedstorage-jei-integration-common/build.gradle
+++ /dev/null
@@ -1,29 +0,0 @@
-plugins {
-    id 'java-library'
-}
-
-archivesBaseName = 'refinedstorage-jei-integration-common'
-
-repositories {
-    maven {
-        url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
-        credentials {
-            username = "anything"
-            password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
-        }
-    }
-    maven {
-        name = 'JEI'
-        url = "https://maven.blamejared.com/"
-    }
-}
-
-commonProject()
-
-dependencies {
-    api "com.refinedmods.refinedstorage:refinedstorage-platform-common:${refinedstorageVersion}"
-    api "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}"
-    api "mezz.jei:jei-${minecraftVersion}-common:${jeiVersion}"
-}
-
-enablePublishing()
\ No newline at end of file
diff --git a/refinedstorage-jei-integration-common/build.gradle.kts b/refinedstorage-jei-integration-common/build.gradle.kts
new file mode 100644
index 0000000..724338d
--- /dev/null
+++ b/refinedstorage-jei-integration-common/build.gradle.kts
@@ -0,0 +1,38 @@
+plugins {
+    id("refinedarchitect.common")
+}
+
+repositories {
+    maven {
+        url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
+        credentials {
+            username = "anything"
+            password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
+        }
+    }
+    maven {
+        name = "JEI"
+        url = uri("https://maven.blamejared.com/")
+    }
+}
+
+refinedarchitect {
+    common()
+    publishing {
+        maven = true
+    }
+}
+
+base {
+    archivesName.set("refinedstorage-jei-integration-common")
+}
+
+val refinedstorageVersion: String by project
+val jeiVersion: String by project
+val minecraftVersion: String by project
+
+dependencies {
+    api("com.refinedmods.refinedstorage:refinedstorage-platform-common:${refinedstorageVersion}")
+    api("mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}")
+    api("mezz.jei:jei-${minecraftVersion}-common:${jeiVersion}")
+}
diff --git a/refinedstorage-jei-integration-fabric/build.gradle b/refinedstorage-jei-integration-fabric/build.gradle
deleted file mode 100644
index a1ce81c..0000000
--- a/refinedstorage-jei-integration-fabric/build.gradle
+++ /dev/null
@@ -1,38 +0,0 @@
-archivesBaseName = 'refinedstorage-jei-integration-fabric'
-
-fabricProject("refinedstorage_jei_integration", project(":refinedstorage-jei-integration-common"))
-
-repositories {
-    maven {
-        url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
-        credentials {
-            username = "anything"
-            password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
-        }
-    }
-    maven {
-        name = 'ModMenu'
-        url 'https://maven.terraformersmc.com/'
-    }
-    maven {
-        name = 'Cloth Config'
-        url 'https://maven.shedaniel.me/'
-    }
-    maven {
-        name = 'NoIndium'
-        url = 'https://maven.cafeteria.dev/releases/'
-    }
-    maven {
-        name = 'JEI'
-        url = "https://maven.blamejared.com/"
-    }
-}
-
-dependencies {
-    modApi "com.refinedmods.refinedstorage:refinedstorage-platform-fabric:${refinedstorageVersion}"
-    modRuntimeOnly "mezz.jei:jei-${minecraftVersion}-fabric:${jeiVersion}"
-    modCompileOnlyApi "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}"
-    modCompileOnlyApi "mezz.jei:jei-${minecraftVersion}-fabric-api:${jeiVersion}"
-}
-
-enablePublishing()
\ No newline at end of file
diff --git a/refinedstorage-jei-integration-fabric/build.gradle.kts b/refinedstorage-jei-integration-fabric/build.gradle.kts
new file mode 100644
index 0000000..f914ee2
--- /dev/null
+++ b/refinedstorage-jei-integration-fabric/build.gradle.kts
@@ -0,0 +1,49 @@
+plugins {
+    id("refinedarchitect.fabric")
+}
+
+repositories {
+    maven {
+        url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
+        credentials {
+            username = "anything"
+            password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
+        }
+    }
+    maven {
+        name = "ModMenu"
+        url = uri("https://maven.terraformersmc.com/")
+    }
+    maven {
+        name = "Cloth Config"
+        url = uri("https://maven.shedaniel.me/")
+    }
+    maven {
+        name = "JEI"
+        url = uri("https://maven.blamejared.com/")
+    }
+}
+
+refinedarchitect {
+    modId = "refinedstorage_jei_integration"
+    fabric()
+    compileWithProject(project(":refinedstorage-jei-integration-common"))
+    publishing {
+        maven = true
+    }
+}
+
+base {
+    archivesName.set("refinedstorage-jei-integration-fabric")
+}
+
+val refinedstorageVersion: String by project
+val jeiVersion: String by project
+val minecraftVersion: String by project
+
+dependencies {
+    modApi("com.refinedmods.refinedstorage:refinedstorage-platform-fabric:${refinedstorageVersion}")
+    modRuntimeOnly("mezz.jei:jei-${minecraftVersion}-fabric:${jeiVersion}")
+    modCompileOnlyApi("mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}")
+    modCompileOnlyApi("mezz.jei:jei-${minecraftVersion}-fabric-api:${jeiVersion}")
+}
diff --git a/refinedstorage-jei-integration-neoforge/build.gradle b/refinedstorage-jei-integration-neoforge/build.gradle
deleted file mode 100644
index aa7b197..0000000
--- a/refinedstorage-jei-integration-neoforge/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-plugins {
-    id 'java-library'
-}
-
-archivesBaseName = 'refinedstorage-jei-integration-neoforge'
-
-neoForgeProject("refinedstorage_jei_integration", project(":refinedstorage-jei-integration-common"))
-
-repositories {
-    maven {
-        url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
-        credentials {
-            username = "anything"
-            password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
-        }
-    }
-    maven {
-        name = 'JEI'
-        url = "https://maven.blamejared.com/"
-    }
-}
-
-dependencies {
-    api "com.refinedmods.refinedstorage:refinedstorage-platform-neoforge:${refinedstorageVersion}"
-    runtimeOnly "mezz.jei:jei-${minecraftVersion}-neoforge:${jeiVersion}"
-    compileOnlyApi "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}"
-    compileOnlyApi "mezz.jei:jei-${minecraftVersion}-neoforge-api:${jeiVersion}"
-}
-
-enablePublishing()
\ No newline at end of file
diff --git a/refinedstorage-jei-integration-neoforge/build.gradle.kts b/refinedstorage-jei-integration-neoforge/build.gradle.kts
new file mode 100644
index 0000000..f993e5a
--- /dev/null
+++ b/refinedstorage-jei-integration-neoforge/build.gradle.kts
@@ -0,0 +1,41 @@
+plugins {
+    id("refinedarchitect.neoforge")
+}
+
+repositories {
+    maven {
+        url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
+        credentials {
+            username = "anything"
+            password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
+        }
+    }
+    maven {
+        name = "JEI"
+        url = uri("https://maven.blamejared.com/")
+    }
+}
+
+refinedarchitect {
+    modId = "refinedstorage_jei_integration"
+    neoForge()
+    compileWithProject(project(":refinedstorage-jei-integration-common"))
+    publishing {
+        maven = true
+    }
+}
+
+base {
+    archivesName.set("refinedstorage-jei-integration-neoforge")
+}
+
+val refinedstorageVersion: String by project
+val jeiVersion: String by project
+val minecraftVersion: String by project
+
+dependencies {
+    api("com.refinedmods.refinedstorage:refinedstorage-platform-neoforge:${refinedstorageVersion}")
+    runtimeOnly("mezz.jei:jei-${minecraftVersion}-neoforge:${jeiVersion}")
+    compileOnlyApi("mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}")
+    compileOnlyApi("mezz.jei:jei-${minecraftVersion}-neoforge-api:${jeiVersion}")
+}
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 7e3b3e6..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,18 +0,0 @@
-gradle.ext.refinedArchitectVersion = "0.15.2"
-
-dependencyResolutionManagement {
-    repositories {
-        maven {
-            url = "https://maven.pkg.github.com/refinedmods/refinedarchitect"
-            credentials {
-                username = "anything"
-                password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
-            }
-        }
-    }
-}
-
-rootProject.name = 'refinedstorage-jei-integration'
-include 'refinedstorage-jei-integration-common'
-include 'refinedstorage-jei-integration-neoforge'
-include 'refinedstorage-jei-integration-fabric'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..8d44c12
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,50 @@
+dependencyResolutionManagement {
+    repositories {
+        maven {
+            url = uri("https://maven.pkg.github.com/refinedmods/refinedarchitect")
+            credentials {
+                username = "anything"
+                password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
+            }
+        }
+    }
+    versionCatalogs {
+        create("libs") {
+            from("com.refinedmods.refinedarchitect:refinedarchitect-versioning:0.16.2")
+        }
+    }
+}
+
+pluginManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        maven {
+            url = uri("https://maven.pkg.github.com/refinedmods/refinedarchitect")
+            credentials {
+                username = "anything"
+                password = "\u0067hp_oGjcDFCn8jeTzIj4Ke9pLoEVtpnZMP4VQgaX"
+            }
+        }
+        maven {
+            name = "Fabric"
+            url = uri("https://maven.fabricmc.net/")
+        }
+        maven {
+            name = "NeoForge"
+            url = uri("https://maven.neoforged.net/releases")
+        }
+    }
+    plugins {
+        id("refinedarchitect.root").version("0.16.2")
+        id("refinedarchitect.base").version("0.16.2")
+        id("refinedarchitect.common").version("0.16.2")
+        id("refinedarchitect.neoforge").version("0.16.2")
+        id("refinedarchitect.fabric").version("0.16.2")
+    }
+}
+
+rootProject.name = "refinedstorage-jei-integration"
+include("refinedstorage-jei-integration-common")
+include("refinedstorage-jei-integration-neoforge")
+include("refinedstorage-jei-integration-fabric")