diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fa24ab46a..4833d4945 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.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.18.0
     with:
       gametests: true
     secrets: inherit
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
index e21ed0371..94c9831f3 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.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.18.0
     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 f8ce8650d..d10da50ef 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.17.1
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.18.0
\ No newline at end of file
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 864977bfc..7a9afc74d 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.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.18.0
     secrets: inherit
     with:
       project-name: 'Refined Storage'
diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml
index 5c6c04a6f..e99cee5d9 100644
--- a/.github/workflows/resolved-issue-locking.yml
+++ b/.github/workflows/resolved-issue-locking.yml
@@ -4,4 +4,4 @@ on:
     - cron: '0 0 * * 1'
 jobs:
   lock:
-    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.17.1
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.18.0
\ No newline at end of file
diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml
index ce5e06ea5..0baa43ae0 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.17.1
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.18.0
\ No newline at end of file
diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml
index db04af17b..1e25455e2 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.17.1
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.18.0
\ No newline at end of file
diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml
index 043dba24c..6a790f177 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.17.1
\ No newline at end of file
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.18.0
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 4da18d71a..ad92cd70d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-refinedarchitectVersion=0.17.1
+refinedarchitectVersion=0.18.0
 # Gradle
 org.gradle.jvmargs=-Xmx1G
diff --git a/refinedstorage-core-api/src/main/resources/fabric.mod.json b/refinedstorage-core-api/src/main/resources/fabric.mod.json
deleted file mode 100644
index 28fec6e52..000000000
--- a/refinedstorage-core-api/src/main/resources/fabric.mod.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "refinedstorage-core-api",
-  "version": "${version}",
-  "name": "Refined Storage Core API",
-  "authors": [
-    "Refined Mods"
-  ],
-  "license": "MIT",
-  "environment": "*",
-  "custom": {
-    "modmenu": {
-      "parent": "refinedstorage",
-      "badges": [
-        "library"
-      ]
-    }
-  }
-}
diff --git a/refinedstorage-fabric/build.gradle.kts b/refinedstorage-fabric/build.gradle.kts
index f1cae6473..488d6e346 100644
--- a/refinedstorage-fabric/build.gradle.kts
+++ b/refinedstorage-fabric/build.gradle.kts
@@ -16,17 +16,6 @@ repositories {
 refinedarchitect {
     modId = "refinedstorage"
     fabric()
-    compileWithProject(project(":refinedstorage-common"))
-    compileWithProject(project(":refinedstorage-common-api"))
-    compileWithProject(project(":refinedstorage-fabric-api"))
-    addProject(project(":refinedstorage-core-api"))
-    addProject(project(":refinedstorage-resource-api"))
-    addProject(project(":refinedstorage-storage-api"))
-    addProject(project(":refinedstorage-network-api"))
-    addProject(project(":refinedstorage-network"))
-    addProject(project(":refinedstorage-grid-api"))
-    addProject(project(":refinedstorage-autocrafting-api"))
-    addProject(project(":refinedstorage-query-parser"))
     publishing {
         maven = true
         // curseForge = "243076"
@@ -38,6 +27,9 @@ base {
     archivesName.set("refinedstorage-fabric")
 }
 
+val commonJava by configurations.existing
+val commonResources by configurations.existing
+
 dependencies {
     modApi(libs.cloth.config) {
         exclude(group = "net.fabricmc.fabric-api")
@@ -48,4 +40,30 @@ dependencies {
     modApi(libs.modmenu)
     include(libs.cloth.config)
     include(libs.teamreborn.energy)
+
+    testCompileOnly(libs.apiguardian)
+
+    compileOnly(project(":refinedstorage-common"))
+    compileOnly(project(":refinedstorage-common-api"))
+    compileOnly(project(":refinedstorage-fabric-api"))
+    compileOnly(project(":refinedstorage-core-api"))
+    compileOnly(project(":refinedstorage-resource-api"))
+    compileOnly(project(":refinedstorage-storage-api"))
+    compileOnly(project(":refinedstorage-network-api"))
+    compileOnly(project(":refinedstorage-network"))
+    compileOnly(project(":refinedstorage-grid-api"))
+    compileOnly(project(":refinedstorage-autocrafting-api"))
+    compileOnly(project(":refinedstorage-query-parser"))
+    commonJava(project(path = ":refinedstorage-common", configuration = "commonJava"))
+    commonResources(project(path = ":refinedstorage-common", configuration = "commonResources"))
+    commonJava(project(path = ":refinedstorage-common-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-fabric-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-core-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-resource-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-storage-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-network-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-network", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-grid-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-autocrafting-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-query-parser", configuration = "commonJava"))
 }
diff --git a/refinedstorage-grid-api/src/main/resources/fabric.mod.json b/refinedstorage-grid-api/src/main/resources/fabric.mod.json
deleted file mode 100644
index 30ce310b3..000000000
--- a/refinedstorage-grid-api/src/main/resources/fabric.mod.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "refinedstorage-grid-api",
-  "version": "${version}",
-  "name": "Refined Storage Grid API",
-  "authors": [
-    "Refined Mods"
-  ],
-  "license": "MIT",
-  "environment": "*",
-  "custom": {
-    "modmenu": {
-      "parent": "refinedstorage",
-      "badges": [
-        "library"
-      ]
-    }
-  }
-}
diff --git a/refinedstorage-neoforge/build.gradle.kts b/refinedstorage-neoforge/build.gradle.kts
index ebb56d715..039e35ba7 100644
--- a/refinedstorage-neoforge/build.gradle.kts
+++ b/refinedstorage-neoforge/build.gradle.kts
@@ -7,17 +7,6 @@ refinedarchitect {
     neoForge()
     gameTests()
     dataGeneration(project(":refinedstorage-common"))
-    compileWithProject(project(":refinedstorage-common"))
-    compileWithProject(project(":refinedstorage-common-api"))
-    compileWithProject(project(":refinedstorage-neoforge-api"))
-    compileWithProject(project(":refinedstorage-core-api"))
-    compileWithProject(project(":refinedstorage-resource-api"))
-    compileWithProject(project(":refinedstorage-storage-api"))
-    compileWithProject(project(":refinedstorage-network-api"))
-    compileWithProject(project(":refinedstorage-network"))
-    compileWithProject(project(":refinedstorage-grid-api"))
-    compileWithProject(project(":refinedstorage-autocrafting-api"))
-    compileWithProject(project(":refinedstorage-query-parser"))
     publishing {
         maven = true
         // curseForge = "243076"
@@ -25,6 +14,37 @@ refinedarchitect {
     }
 }
 
+val commonJava by configurations.existing
+val commonResources by configurations.existing
+
+dependencies {
+    testCompileOnly(libs.apiguardian)
+
+    compileOnly(project(":refinedstorage-common"))
+    compileOnly(project(":refinedstorage-common-api"))
+    compileOnly(project(":refinedstorage-neoforge-api"))
+    compileOnly(project(":refinedstorage-core-api"))
+    compileOnly(project(":refinedstorage-resource-api"))
+    compileOnly(project(":refinedstorage-storage-api"))
+    compileOnly(project(":refinedstorage-network-api"))
+    compileOnly(project(":refinedstorage-network"))
+    compileOnly(project(":refinedstorage-grid-api"))
+    compileOnly(project(":refinedstorage-autocrafting-api"))
+    compileOnly(project(":refinedstorage-query-parser"))
+    commonJava(project(path = ":refinedstorage-common", configuration = "commonJava"))
+    commonResources(project(path = ":refinedstorage-common", configuration = "commonResources"))
+    commonJava(project(path = ":refinedstorage-common-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-neoforge-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-core-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-resource-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-storage-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-network-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-network", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-grid-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-autocrafting-api", configuration = "commonJava"))
+    commonJava(project(path = ":refinedstorage-query-parser", configuration = "commonJava"))
+}
+
 base {
     archivesName.set("refinedstorage-neoforge")
 }
diff --git a/refinedstorage-network-api/src/main/resources/fabric.mod.json b/refinedstorage-network-api/src/main/resources/fabric.mod.json
deleted file mode 100644
index cf67514dd..000000000
--- a/refinedstorage-network-api/src/main/resources/fabric.mod.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "refinedstorage-network-api",
-  "version": "${version}",
-  "name": "Refined Storage Network API",
-  "authors": [
-    "Refined Mods"
-  ],
-  "license": "MIT",
-  "environment": "*",
-  "custom": {
-    "modmenu": {
-      "parent": "refinedstorage",
-      "badges": [
-        "library"
-      ]
-    }
-  }
-}
diff --git a/refinedstorage-network/src/main/resources/fabric.mod.json b/refinedstorage-network/src/main/resources/fabric.mod.json
deleted file mode 100644
index fd70f35e4..000000000
--- a/refinedstorage-network/src/main/resources/fabric.mod.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "refinedstorage-network",
-  "version": "${version}",
-  "name": "Refined Storage Network",
-  "authors": [
-    "Refined Mods"
-  ],
-  "license": "MIT",
-  "environment": "*",
-  "custom": {
-    "modmenu": {
-      "parent": "refinedstorage",
-      "badges": [
-        "library"
-      ]
-    }
-  }
-}
diff --git a/refinedstorage-query-parser/src/main/resources/fabric.mod.json b/refinedstorage-query-parser/src/main/resources/fabric.mod.json
deleted file mode 100644
index 0970459fb..000000000
--- a/refinedstorage-query-parser/src/main/resources/fabric.mod.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "refinedstorage-query-parser",
-  "version": "${version}",
-  "name": "Refined Storage Query Parser",
-  "authors": [
-    "Refined Mods"
-  ],
-  "license": "MIT",
-  "environment": "*",
-  "custom": {
-    "modmenu": {
-      "parent": "refinedstorage",
-      "badges": [
-        "library"
-      ]
-    }
-  }
-}
diff --git a/refinedstorage-resource-api/src/main/resources/fabric.mod.json b/refinedstorage-resource-api/src/main/resources/fabric.mod.json
deleted file mode 100644
index 0a1733787..000000000
--- a/refinedstorage-resource-api/src/main/resources/fabric.mod.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "refinedstorage-resource-api",
-  "version": "${version}",
-  "name": "Refined Storage Resource API",
-  "authors": [
-    "Refined Mods"
-  ],
-  "license": "MIT",
-  "environment": "*",
-  "custom": {
-    "modmenu": {
-      "parent": "refinedstorage",
-      "badges": [
-        "library"
-      ]
-    }
-  }
-}
diff --git a/refinedstorage-storage-api/src/main/resources/fabric.mod.json b/refinedstorage-storage-api/src/main/resources/fabric.mod.json
deleted file mode 100644
index b7e49a488..000000000
--- a/refinedstorage-storage-api/src/main/resources/fabric.mod.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "refinedstorage-storage-api",
-  "version": "${version}",
-  "name": "Refined Storage Storage API",
-  "authors": [
-    "Refined Mods"
-  ],
-  "license": "MIT",
-  "environment": "*",
-  "custom": {
-    "modmenu": {
-      "parent": "refinedstorage",
-      "badges": [
-        "library"
-      ]
-    }
-  }
-}