diff --git a/.github/workflows/node-zxc-build-release-artifact.yaml b/.github/workflows/node-zxc-build-release-artifact.yaml
index 27a335cc3189..175beb19521c 100644
--- a/.github/workflows/node-zxc-build-release-artifact.yaml
+++ b/.github/workflows/node-zxc-build-release-artifact.yaml
@@ -845,7 +845,7 @@ jobs:
           NEXUS_PASSWORD: ${{ secrets.sdk-ossrh-password }}
         with:
           gradle-version: ${{ inputs.gradle-version }}
-          arguments: "release${{ inputs.release-profile }} -PpublishingPackageGroup=com.swirlds --scan -PpublishSigningEnabled=true --no-configuration-cache"
+          arguments: "release${{ inputs.release-profile }} -PpublishingPackageGroup=com.swirlds -Ps01SonatypeHost=true -PpublishSigningEnabled=true --scan --no-configuration-cache"
 
       - name: Gradle Publish Services to ${{ inputs.version-policy == 'specified' && 'Maven Central' || 'Google Artifact Registry' }} (${{ inputs.release-profile }})
         uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
@@ -855,7 +855,7 @@ jobs:
           NEXUS_PASSWORD: ${{ secrets.svcs-ossrh-password }}
         with:
           gradle-version: ${{ inputs.gradle-version }}
-          arguments: "release${{ inputs.release-profile }} -PpublishingPackageGroup=com.hedera --scan -PpublishSigningEnabled=true --no-configuration-cache"
+          arguments: "release${{ inputs.release-profile }} -PpublishingPackageGroup=com.hedera.hashgraph -PpublishSigningEnabled=true --scan --no-configuration-cache"
 
       - name: Upload SDK Release Archives
         if: ${{ inputs.dry-run-enabled != true && inputs.version-policy == 'specified' && !cancelled() && !failure() }}
diff --git a/developers.properties b/developers.properties
new file mode 100644
index 000000000000..36613f47b583
--- /dev/null
+++ b/developers.properties
@@ -0,0 +1,6 @@
+# This file is here for 'hapi', because that "product" is missing the toplevel folder
+# (it contains the 'hapi' module directly)
+hedera-base@swirldslabs.com=Hedera Base Team
+hedera-services@swirldslabs.com=Hedera Services Team
+hedera-smart-contracts@swirldslabs.com=Hedera Smart Contracts Team
+release-engineering@swirldslabs.com=Release Engineering Team
diff --git a/example-apps/swirlds-platform-base-example/build.gradle.kts b/example-apps/swirlds-platform-base-example/build.gradle.kts
index 7f3e5f02a809..4f126e6c7ce3 100644
--- a/example-apps/swirlds-platform-base-example/build.gradle.kts
+++ b/example-apps/swirlds-platform-base-example/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("application")
-    id("com.hedera.gradle.platform")
-}
+plugins { id("com.hedera.gradle.module.application") }
 
 mainModuleInfo {
     annotationProcessor("com.swirlds.config.processor")
@@ -25,4 +22,4 @@ mainModuleInfo {
     runtimeOnly("com.swirlds.config.impl")
 }
 
-application.mainClass.set("com.swirlds.platform.base.example.Application")
+application.mainClass = "com.swirlds.platform.base.example.Application"
diff --git a/gradle/development-branch.txt b/gradle/development-branch.txt
new file mode 100644
index 000000000000..ce57f6456319
--- /dev/null
+++ b/gradle/development-branch.txt
@@ -0,0 +1 @@
+develop
\ No newline at end of file
diff --git a/gradle/hedera-gradle-conventions/build.gradle.kts b/gradle/hedera-gradle-conventions/build.gradle.kts
new file mode 100644
index 000000000000..d0bc5b6de90f
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/build.gradle.kts
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    `kotlin-dsl`
+}
+
+repositories { gradlePluginPortal() }
+
+dependencies {
+    implementation("com.adarshr:gradle-test-logger-plugin:4.0.0")
+    implementation("com.autonomousapps:dependency-analysis-gradle-plugin:2.0.1")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
+    implementation("com.google.protobuf:protobuf-gradle-plugin:0.9.4")
+    implementation("com.gradle:develocity-gradle-plugin:3.18")
+    implementation(
+        "gradle.plugin.com.google.cloud.artifactregistry:artifactregistry-gradle-plugin:2.2.2"
+    )
+    implementation("io.github.gradle-nexus:publish-plugin:1.3.0")
+    implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
+    implementation("net.swiftzer.semver:semver:1.3.0")
+    implementation("org.gradlex:extra-java-module-info:1.8")
+    implementation("org.gradlex:jvm-dependency-conflict-resolution:2.1.2")
+    implementation("org.gradlex:java-module-dependencies:1.7")
+}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.jpms-modules.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.base.jpms-modules.gradle.kts
similarity index 97%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.jpms-modules.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.base.jpms-modules.gradle.kts
index d9fc4b1d9ed0..3650feff7707 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.jpms-modules.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.base.jpms-modules.gradle.kts
@@ -19,6 +19,11 @@ plugins {
     id("org.gradlex.extra-java-module-info")
 }
 
+jvmDependencyConflicts.consistentResolution {
+    providesVersions(":reports")
+    platform(":hedera-dependency-versions")
+}
+
 // Fix or enhance the metadata of third-party Modules. This is about the metadata in the
 // repositories: '*.pom' and '*.module' files.
 jvmDependencyConflicts.patch {
@@ -112,10 +117,7 @@ extraJavaModuleInfo {
     module("io.grpc:grpc-protobuf", "io.grpc.protobuf")
     module("io.grpc:grpc-protobuf-lite", "io.grpc.protobuf.lite")
     module("com.github.spotbugs:spotbugs-annotations", "com.github.spotbugs.annotations")
-    module("com.google.code.findbugs:jsr305", "java.annotation") {
-        exportAllPackages()
-        mergeJar("javax.annotation:javax.annotation-api")
-    }
+    module("com.google.code.findbugs:jsr305", "java.annotation")
     module("com.google.errorprone:error_prone_annotations", "com.google.errorprone.annotations")
     module("com.google.j2objc:j2objc-annotations", "com.google.j2objc.annotations")
     module("com.google.protobuf:protobuf-java", "com.google.protobuf") {
@@ -259,3 +261,6 @@ extraJavaModuleInfo {
     module("org.testcontainers:testcontainers", "org.testcontainers")
     module("org.mockito:mockito-junit-jupiter", "org.mockito.junit.jupiter")
 }
+
+// In case published versions of a module are also available, always prefer the local one
+configurations.all { resolutionStrategy.preferProjectModules() }
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.lifecycle.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.base.lifecycle.gradle.kts
similarity index 77%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.lifecycle.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.base.lifecycle.gradle.kts
index c0e1aa4fd83c..8e4bb3499cc1 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.lifecycle.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.base.lifecycle.gradle.kts
@@ -14,25 +14,21 @@
  * limitations under the License.
  */
 
-plugins {
-    id("base")
-    id("com.diffplug.spotless")
-}
+plugins { id("base") }
 
-// Convenience for local development: when running './gradlew' without any parameters just show the
-// tasks from the 'build' group
+// Convenience for local development: when running './gradlew' without any parameters show the tasks
+// from the 'build' group
 defaultTasks("tasks")
 
-tasks.named<TaskReportTask>("tasks") {
-    if (!isDetail) {
-        displayGroup = "build"
-    }
+tasks.register("qualityCheck") {
+    group = "build"
+    description = "Run all spotless and quality checks."
+    dependsOn(tasks.assemble)
 }
 
 tasks.register("qualityGate") {
     group = "build"
     description = "Apply spotless rules and run all quality checks."
-    dependsOn(tasks.spotlessApply)
     dependsOn(tasks.assemble)
 }
 
diff --git a/build.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.base.version.gradle.kts
similarity index 73%
rename from build.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.base.version.gradle.kts
index 9c998aff3795..e3fb2497a57d 100644
--- a/build.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.base.version.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Hedera Hashgraph, LLC
+ * Copyright (C) 2016-2024 Hedera Hashgraph, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,4 +14,9 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.root") }
+version =
+    providers
+        .fileContents(isolated.rootProject.projectDirectory.file("version.txt"))
+        .asText
+        .get()
+        .trim()
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.build.settings.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.build.settings.gradle.kts
new file mode 100644
index 000000000000..8ec267121a31
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.build.settings.gradle.kts
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.gradlex.javamodule.dependencies.initialization.JavaModulesExtension
+import org.gradlex.javamodule.dependencies.initialization.RootPluginsExtension
+
+plugins {
+    id("org.gradlex.java-module-dependencies")
+    id("com.hedera.gradle.feature.build-cache")
+    id("com.hedera.gradle.feature.repositories")
+    id("com.hedera.gradle.report.develocity")
+}
+
+// Allow projects inside a build to be addressed by dependency coordinates notation.
+// https://docs.gradle.org/current/userguide/composite_builds.html#included_build_declaring_substitutions
+// Some functionality of the 'java-module-dependencies' plugin relies on this.
+includeBuild(".")
+
+configure<JavaModulesExtension> {
+    // Project to aggregate code coverage data for the whole repository into one report
+    module("gradle/reports")
+
+    // "BOM" with versions of 3rd party dependencies
+    versions("hedera-dependency-versions")
+}
+
+// Plugins that are global, but are applied to the "root project" instead of settings.
+// by having this block here, we  do not require a "build.gradle.kts" in the repository roots.
+configure<RootPluginsExtension> {
+    id("com.hedera.gradle.base.lifecycle")
+    id("com.hedera.gradle.feature.publish-maven-central.root")
+    id("com.hedera.gradle.feature.versioning")
+    id("com.hedera.gradle.check.spotless")
+    id("com.hedera.gradle.check.spotless-kotlin")
+    id("com.hedera.gradle.check.spotless-markdown")
+    id("com.hedera.gradle.check.spotless-misc")
+    id("com.hedera.gradle.check.spotless-yaml")
+}
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.dependencies.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.dependencies.gradle.kts
new file mode 100644
index 000000000000..f3fd64a88792
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.dependencies.gradle.kts
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.autonomousapps.DependencyAnalysisSubExtension
+import org.gradlex.javamodule.dependencies.tasks.ModuleDirectivesOrderingCheck
+import org.gradlex.javamodule.dependencies.tasks.ModuleDirectivesScopeCheck
+
+plugins {
+    id("com.autonomousapps.dependency-analysis")
+    id("com.hedera.gradle.base.lifecycle")
+    id("com.hedera.gradle.base.jpms-modules")
+}
+
+// ordering check is done by SortModuleInfoRequiresStep
+tasks.withType<ModuleDirectivesOrderingCheck> { enabled = false }
+
+// Do not report dependencies from one source set to another as 'required'.
+// In particular, in case of test fixtures, the analysis would suggest to
+// add as testModuleInfo { require(...) } to the main module. This is
+// conceptually wrong, because in whitebox testing the 'main' and 'test'
+// module are conceptually considered one module (main module extended with tests)
+configure<DependencyAnalysisSubExtension> { issues { onAny { exclude(project.path) } } }
+
+tasks.named("qualityGate") { dependsOn(tasks.withType<ModuleDirectivesScopeCheck>()) }
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.spotless-java.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-java.gradle.kts
similarity index 98%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.spotless-java.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-java.gradle.kts
index 984b2cece001..f965bfd6b185 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.spotless-java.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-java.gradle.kts
@@ -18,7 +18,7 @@ import com.hedera.gradle.spotless.RepairDashedCommentsFormatterStep
 import com.hedera.gradle.spotless.SortModuleInfoRequiresStep
 import com.hedera.gradle.spotless.StripOldLicenseFormatterStep
 
-plugins { id("com.hedera.gradle.spotless") }
+plugins { id("com.diffplug.spotless") }
 
 spotless {
     java {
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.spotless-kotlin.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-kotlin.gradle.kts
similarity index 78%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.spotless-kotlin.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-kotlin.gradle.kts
index 68fcb3923015..9963652d7d6d 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.spotless-kotlin.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-kotlin.gradle.kts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.spotless") }
+plugins { id("com.diffplug.spotless") }
 
 spotless {
     kotlinGradle {
@@ -39,8 +39,18 @@ spotless {
             */${"\n\n"}
         """
                     .trimIndent(),
-                "(import|plugins|pluginManagement|dependencyResolutionManagement|repositories|tasks|allprojects|subprojects)"
+                "(import|plugins|pluginManagement|dependencyResolutionManagement|repositories|tasks|allprojects|subprojects|buildCache|version)"
             )
             .updateYearWithLatest(true)
     }
+
+    if (project.parent == null) {
+        // If this is the root project, we also check Gradle plugin scripts
+        kotlinGradle { target("gradle/plugins/**/*.gradle.kts") }
+        kotlin {
+            // For the Kotlin classes (*.kt files)
+            ktfmt().kotlinlangStyle()
+            target("gradle/plugins/**/*.kt")
+        }
+    }
 }
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.spotless-markdown.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-markdown.gradle.kts
similarity index 90%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.spotless-markdown.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-markdown.gradle.kts
index 1505c1a7c80e..df46529caab0 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.spotless-markdown.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-markdown.gradle.kts
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.spotless") }
+plugins { id("com.diffplug.spotless") }
 
 spotless {
     flexmark {
         target("**/*.md")
+        targetExclude("platform-sdk/sdk/**")
         flexmark()
         trimTrailingWhitespace()
         indentWithSpaces()
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.services.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-misc.gradle.kts
similarity index 67%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.services.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-misc.gradle.kts
index b12ff59f1ee7..739d6282c462 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.services.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-misc.gradle.kts
@@ -14,7 +14,16 @@
  * limitations under the License.
  */
 
-plugins {
-    id("java-library")
-    id("com.hedera.gradle.java")
+plugins { id("com.diffplug.spotless") }
+
+spotless {
+    format("misc") {
+        // define the files to apply `misc` to
+        target(".gitignore")
+
+        // define the steps to apply to those files
+        trimTrailingWhitespace()
+        indentWithSpaces()
+        endWithNewline()
+    }
 }
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.spotless.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-yaml.gradle.kts
similarity index 82%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.spotless.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-yaml.gradle.kts
index 4c027596fe37..d3c1a05186af 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.spotless.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless-yaml.gradle.kts
@@ -17,22 +17,6 @@
 plugins { id("com.diffplug.spotless") }
 
 spotless {
-    // Disable the automatic application of Spotless to all source sets when the check task is run.
-    isEnforceCheck = false
-
-    // optional: limit format enforcement to just the files changed by this feature branch
-    ratchetFrom("origin/develop")
-
-    format("misc") {
-        // define the files to apply `misc` to
-        target(".gitignore")
-
-        // define the steps to apply to those files
-        trimTrailingWhitespace()
-        indentWithSpaces()
-        endWithNewline()
-    }
-
     format("actionYaml") {
         target(".github/workflows/*.yaml")
         /*
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless.gradle.kts
new file mode 100644
index 000000000000..3e4437297a51
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.check.spotless.gradle.kts
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("com.hedera.gradle.base.lifecycle")
+    id("com.diffplug.spotless")
+}
+
+spotless {
+    // Disable the automatic application of Spotless to all source sets when the check task is run.
+    isEnforceCheck = false
+
+    // limit format enforcement to just the files changed by this feature branch
+    @Suppress("UnstableApiUsage")
+    ratchetFrom(
+        "origin/" +
+            providers
+                .fileContents(
+                    isolated.rootProject.projectDirectory.file("gradle/development-branch.txt")
+                )
+                .asText
+                .getOrElse("main")
+    )
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    // When doing a 'qualityGate' run, make sure spotlessApply is done before doing compilation and
+    // other checks based on compiled code
+    mustRunAfter(tasks.spotlessApply)
+}
+
+tasks.named("qualityCheck") { dependsOn(tasks.spotlessCheck) }
+
+tasks.named("qualityGate") { dependsOn(tasks.spotlessApply) }
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.benchmark.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.benchmark.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.benchmark.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.benchmark.gradle.kts
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.build-cache.settings.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.build-cache.settings.gradle.kts
new file mode 100644
index 000000000000..0fcf2bd16a55
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.build-cache.settings.gradle.kts
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+buildCache {
+    remote<HttpBuildCache> {
+        url = uri("https://cache.gradle.hedera.svcs.eng.swirldslabs.io/cache/")
+
+        isUseExpectContinue = true
+        isEnabled = !gradle.startParameter.isOffline
+
+        val isCiServer = providers.environmentVariable("CI").getOrElse("false").toBoolean()
+        val gradleCacheUsername = providers.environmentVariable("GRADLE_CACHE_USERNAME")
+        val gradleCachePassword = providers.environmentVariable("GRADLE_CACHE_PASSWORD")
+        if (isCiServer && gradleCacheUsername.isPresent && gradleCachePassword.isPresent) {
+            isPush = true
+            credentials {
+                username = gradleCacheUsername.get()
+                password = gradleCachePassword.get()
+            }
+        }
+    }
+}
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.git-properties-file.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.git-properties-file.gradle.kts
new file mode 100644
index 000000000000..9439576aca27
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.git-properties-file.gradle.kts
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins { id("java") }
+
+tasks.register<WriteProperties>("writeGitProperties") {
+    property("git.build.version", project.version)
+    @Suppress("UnstableApiUsage")
+    property(
+        "git.commit.id",
+        providers
+            .exec { commandLine("git", "rev-parse", "HEAD") }
+            .standardOutput
+            .asText
+            .map { it.trim() }
+    )
+    @Suppress("UnstableApiUsage")
+    property(
+        "git.commit.id.abbrev",
+        providers
+            .exec { commandLine("git", "rev-parse", "HEAD") }
+            .standardOutput
+            .asText
+            .map { it.trim().substring(0, 7) }
+    )
+
+    destinationFile = layout.buildDirectory.file("generated/git/git.properties")
+}
+
+tasks.processResources { from(tasks.named("writeGitProperties")) }
+
+// ignore the content of 'git.properties' when using a classpath as task input
+normalization.runtimeClasspath { ignore("git.properties") }
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.java-compile.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.java-compile.gradle.kts
new file mode 100644
index 000000000000..c2c39166d642
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.java-compile.gradle.kts
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins { id("java") }
+
+@Suppress("UnstableApiUsage")
+val fullJavaVersion =
+    providers
+        .fileContents(isolated.rootProject.projectDirectory.file("gradle/jdk-version.txt"))
+        .asText
+        .get()
+        .trim()
+val majorJavaVersion = JavaVersion.toVersion(fullJavaVersion)
+val currentJavaVersion = providers.systemProperty("java.version").get()
+
+if (currentJavaVersion != fullJavaVersion) {
+    val message =
+        "Gradle runs with Java $currentJavaVersion. This project works best running with Java $fullJavaVersion. " +
+            "\n - From commandline: change JAVA_HOME and/or PATH to point at Java $fullJavaVersion installation." +
+            "\n - From IntelliJ: change 'Gradle JVM' in 'Gradle Settings' to point at Java $fullJavaVersion installation."
+
+    logger.lifecycle("WARN: $message")
+}
+
+val deactivatedCompileLintOptions =
+    listOf(
+        // In Gradle, a module does not see the upstream (not-yet-compiled) modules. This could
+        // only be solved by calling 'javac' with '--source-module-path' to make other sources
+        // known. But this is at odds with how Gradle's incremental compilation calls the
+        // compiler for a subset of Java files for each project individually.
+        "module", // module not found when doing 'exports to ...'
+        "serial", // serializable class ... has no definition of serialVersionUID
+        "processing", // No processor claimed any of these annotations: ...
+        "try", // auto-closeable resource ignore is never referenced... (AutoClosableLock)
+        "missing-explicit-ctor", // class ... declares no explicit constructors
+
+        // Needed because we use deprecation internally and do not fix all uses right away
+        "removal",
+        "deprecation",
+
+        // The following checks could be activated and fixed:
+        "this-escape", // calling public/protected method in constructor
+        "overrides", // overrides equals, but neither it ... overrides hashCode method
+        "unchecked",
+        "rawtypes"
+    )
+
+java {
+    sourceCompatibility = majorJavaVersion
+    targetCompatibility = majorJavaVersion
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    // Track the full Java version as input (e.g. 17.0.3 vs. 17.0.9).
+    // By default, Gradle only tracks the major version as defined in the toolchain (e.g. 17).
+    // Since the full version is encoded in 'module-info.class' files, it should be tracked as
+    // it otherwise leads to wrong build cache hits.
+    inputs.property("fullJavaVersion", currentJavaVersion)
+
+    options.encoding = "UTF-8"
+    options.isFork = true // run compiler in separate JVM process (independent of toolchain setup)
+    options.compilerArgs.add("-implicit:none")
+    options.compilerArgs.add("-Werror")
+    options.compilerArgs.add("-Xlint:all,-" + deactivatedCompileLintOptions.joinToString(",-"))
+
+    doLast {
+        // Make sure consistent line ending are used in files generated by annotation processors by
+        // rewriting generated files.
+        // To fix this problem at the root, one of these issues needs to be addressed upstream:
+        // - https://github.com/google/auto/issues/1656
+        // - https://github.com/gradle/gradle/issues/27385
+        if (System.lineSeparator() != "\n") {
+            destinationDirectory
+                .get()
+                .asFileTree
+                .filter { it.extension != "class" }
+                .forEach {
+                    val content = it.readText()
+                    val normalizedContent = content.replace(System.lineSeparator(), "\n")
+                    if (content != normalizedContent) {
+                        it.writeText(normalizedContent)
+                    }
+                }
+        }
+    }
+}
+
+tasks.withType<AbstractArchiveTask>().configureEach {
+    isPreserveFileTimestamps = false
+    isReproducibleFileOrder = true
+    filePermissions { unix("0664") }
+    dirPermissions { unix("0775") }
+}
+
+sourceSets.all {
+    // Remove 'classes' tasks from 'build' group to keep it cleaned up
+    tasks.named(classesTaskName) { group = null }
+
+    // 'assemble' compiles all sources, including all test sources
+    tasks.assemble { dependsOn(tasks.named(classesTaskName)) }
+}
+
+tasks.buildDependents { setGroup(null) }
+
+tasks.buildNeeded { setGroup(null) }
+
+tasks.jar { setGroup(null) }
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.java-doc.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.java-doc.gradle.kts
new file mode 100644
index 000000000000..4a0f3baf4d4f
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.java-doc.gradle.kts
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins { id("java") }
+
+tasks.withType<Javadoc>().configureEach {
+    options {
+        this as StandardJavadocDocletOptions
+        encoding = "UTF-8"
+        tags(
+            "apiNote:a:API Note:",
+            "implSpec:a:Implementation Requirements:",
+            "implNote:a:Implementation Note:"
+        )
+        options.windowTitle = "Hedera Consensus Node"
+        options.memberLevel = JavadocMemberLevel.PACKAGE
+        addStringOption("Xdoclint:all,-missing", "-Xwerror")
+    }
+}
+
+tasks.assemble { dependsOn(tasks.javadoc) }
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.platform.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.java-execute.gradle.kts
similarity index 64%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.platform.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.java-execute.gradle.kts
index b12ff59f1ee7..11899cba5480 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.platform.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.java-execute.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
+ * Copyright (C) 2024 Hedera Hashgraph, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 
-plugins {
-    id("java-library")
-    id("com.hedera.gradle.java")
+plugins { id("java") }
+
+tasks.withType<JavaExec>().configureEach {
+    // Do not yet run things on the '--module-path'
+    modularity.inferModulePath = false
+    if (name.endsWith("main()")) {
+        notCompatibleWithConfigurationCache("JavaExec created by IntelliJ")
+    }
 }
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.protobuf.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.protobuf.gradle.kts
similarity index 63%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.protobuf.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.protobuf.gradle.kts
index 4a8151a4e032..83feca4c8017 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.protobuf.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.protobuf.gradle.kts
@@ -17,35 +17,29 @@
 import com.google.protobuf.gradle.id
 
 plugins {
-    id("com.hedera.gradle.services")
+    id("java")
     id("com.google.protobuf")
 }
 
 // Configure Protobuf Plugin to download protoc executable rather than using local installed version
 protobuf {
-    val libs = the<VersionCatalogsExtension>().named("libs")
-    protoc { artifact = "com.google.protobuf:protoc:" + libs.findVersion("google-proto").get() }
+    protoc { artifact = "com.google.protobuf:protoc" }
     plugins {
         // Add GRPC plugin as we need to generate GRPC services
-        id("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:" + libs.findVersion("grpc-proto").get()
-        }
+        id("grpc") { artifact = "io.grpc:protoc-gen-grpc-java" }
+    }
+    generateProtoTasks {
+        all().configureEach { plugins { id("grpc") { option("@generated=omit") } } }
     }
-    generateProtoTasks { ofSourceSet("main").forEach { it.plugins { id("grpc") } } }
 }
 
-sourceSets.all {
-    val compileProtoPath = getTaskName("", "compileProtoPath")
-    dependencies {
-        // For dependencies of protobuf compilation use versions from 'hedera-dependency-versions',
-        // but not 'runtime' dependencies of the platform (JAVA_API instead of JAVA_RUNTIME).
-        dependencies {
-            compileProtoPath(project(":hedera-dependency-versions")) {
-                attributes {
-                    attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_API))
-                    attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.REGULAR_PLATFORM))
-                }
-            }
+configurations.configureEach {
+    if (name.startsWith("protobufToolsLocator") || name.endsWith("ProtoPath")) {
+        attributes { attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_API)) }
+        exclude(group = project.group.toString(), module = project.name)
+        withDependencies {
+            isTransitive = true
+            extendsFrom(configurations["internal"])
         }
     }
 }
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.publish-artifactregistry.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.publish-artifactregistry.gradle.kts
new file mode 100644
index 000000000000..ce5bfaa26001
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.publish-artifactregistry.gradle.kts
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2023-2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins { id("maven-publish") }
+
+if (gradle.startParameter.taskNames.any { it.startsWith("release") }) {
+    // We apply the 'artifactregistry' plugin conditionally, as it does not support configuration
+    // cache.
+    // https://github.com/GoogleCloudPlatform/artifact-registry-maven-tools/issues/85
+    apply(plugin = "com.google.cloud.artifactregistry.gradle-plugin")
+}
+
+publishing.repositories {
+    maven("artifactregistry://us-maven.pkg.dev/swirlds-registry/maven-prerelease-channel") {
+        name = "prereleaseChannel"
+    }
+    maven("artifactregistry://us-maven.pkg.dev/swirlds-registry/maven-develop-snapshots") {
+        name = "developSnapshot"
+    }
+    maven("artifactregistry://us-maven.pkg.dev/swirlds-registry/maven-develop-daily-snapshots") {
+        name = "developDailySnapshot"
+    }
+    maven("artifactregistry://us-maven.pkg.dev/swirlds-registry/maven-develop-commits") {
+        name = "developCommit"
+    }
+    maven("artifactregistry://us-maven.pkg.dev/swirlds-registry/maven-adhoc-commits") {
+        name = "adhocCommit"
+    }
+}
+
+// Register one 'release*' task for each publishing repository
+publishing.repositories.all {
+    val ucName = name.replaceFirstChar { it.titlecase() }
+    tasks.register("release$ucName") {
+        group = "release"
+        dependsOn(tasks.named("publishMavenPublicationTo${ucName}Repository"))
+    }
+}
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.publish-maven-central.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.publish-maven-central.gradle.kts
new file mode 100644
index 000000000000..ea2601228e10
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.publish-maven-central.gradle.kts
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2016-2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.Properties
+
+plugins {
+    id("java")
+    id("maven-publish")
+    id("signing")
+    id("com.hedera.gradle.base.lifecycle")
+}
+
+tasks.withType<PublishToMavenRepository>().configureEach {
+    // Publishing tasks are only enabled if we publish to the matching group.
+    // Otherwise, Nexus configuration and credentials do not fit.
+    val publishingPackageGroup = providers.gradleProperty("publishingPackageGroup").orNull
+    enabled = publishingPackageGroup == project.group
+}
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+tasks.withType<Jar>().configureEach { setGroup(null) }
+
+tasks.named("releaseMavenCentral") {
+    group = "release"
+    dependsOn(tasks.named("publishToSonatype"))
+}
+
+val maven =
+    publishing.publications.create<MavenPublication>("maven") {
+        from(components["java"])
+        versionMapping {
+            // Everything published takes the versions from the resolution result.
+            // These are the versions we define in 'hedera-dependency-versions'
+            // and use consistently in all modules.
+            allVariants { fromResolutionResult() }
+        }
+
+        pom {
+            val devGroups = Properties()
+            devGroups.load(
+                providers
+                    .fileContents(layout.projectDirectory.file("../developers.properties"))
+                    .asText
+                    .get()
+                    .reader()
+            )
+
+            url = "https://www.hashgraph.com/"
+            inceptionYear = "2016"
+
+            description =
+                providers
+                    .fileContents(layout.projectDirectory.file("../description.txt"))
+                    .asText
+                    .orElse(provider { project.description })
+                    .map { it.replace("\n", " ").trim() }
+                    .orNull
+
+            organization {
+                name = "Hedera Hashgraph, LLC"
+                url = "https://www.hedera.com"
+            }
+
+            licenses {
+                license {
+                    name = "Apache License, Version 2.0"
+                    url = "https://raw.githubusercontent.com/hashgraph/hedera-services/main/LICENSE"
+                }
+            }
+
+            scm {
+                connection = "scm:git:git://github.com/hashgraph/hedera-services.git"
+                developerConnection = "scm:git:ssh://github.com:hashgraph/hedera-services.git"
+                url = "https://github.com/hashgraph/hedera-services"
+            }
+
+            developers {
+                devGroups.forEach { mail, team ->
+                    developer {
+                        name = team as String
+                        email = mail as String
+                        organization = "Hedera Hashgraph"
+                        organizationUrl = "https://www.hedera.com"
+                    }
+                }
+            }
+        }
+    }
+
+val publishSigningEnabled =
+    providers.gradleProperty("publishSigningEnabled").getOrElse("false").toBoolean()
+
+if (publishSigningEnabled) {
+    signing {
+        sign(maven)
+        useGpgCmd()
+    }
+}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.nexus-publish.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.publish-maven-central.root.gradle.kts
similarity index 85%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.nexus-publish.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.publish-maven-central.root.gradle.kts
index 182be0a43f10..1f7bb5351054 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.nexus-publish.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.publish-maven-central.root.gradle.kts
@@ -15,20 +15,19 @@
  */
 
 plugins {
-    id("com.hedera.gradle.lifecycle")
+    id("com.hedera.gradle.base.lifecycle")
     id("io.github.gradle-nexus.publish-plugin")
 }
 
-val publishingPackageGroup = providers.gradleProperty("publishingPackageGroup").getOrElse("")
-val isPlatformPublish = publishingPackageGroup == "com.swirlds"
-
 nexusPublishing {
-    packageGroup = publishingPackageGroup
+    val s01SonatypeHost = providers.gradleProperty("s01SonatypeHost").getOrElse("false").toBoolean()
+    packageGroup = providers.gradleProperty("publishingPackageGroup").getOrElse("")
+
     repositories {
         sonatype {
             username = System.getenv("NEXUS_USERNAME")
             password = System.getenv("NEXUS_PASSWORD")
-            if (isPlatformPublish) {
+            if (s01SonatypeHost) {
                 nexusUrl = uri("https://s01.oss.sonatype.org/service/local/")
                 snapshotRepositoryUrl =
                     uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.repositories.settings.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.repositories.settings.gradle.kts
new file mode 100644
index 000000000000..a2cb30242d57
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.repositories.settings.gradle.kts
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2016-2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+dependencyResolutionManagement {
+    @Suppress("UnstableApiUsage")
+    repositories {
+        maven("https://hyperledger.jfrog.io/artifactory/besu-maven") {
+            content { includeGroupByRegex("org\\.hyperledger\\..*") }
+        }
+        maven("https://artifacts.consensys.net/public/maven/maven/") {
+            content { includeGroupByRegex("tech\\.pegasys(\\..*)?") }
+        }
+        mavenCentral()
+        maven("https://oss.sonatype.org/content/repositories/snapshots")
+    }
+}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.test-fixtures.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.test-fixtures.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.test-fixtures.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.test-fixtures.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.test-hammer.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.test-hammer.gradle.kts
similarity index 95%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.test-hammer.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.test-hammer.gradle.kts
index 2d9aaba59527..43eeb3cdc447 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.test-hammer.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.test-hammer.gradle.kts
@@ -26,15 +26,13 @@ testing.suites {
         targets.all {
             testTask {
                 group = "build"
+                maxHeapSize = "8g"
                 usesService(
                     gradle.sharedServices.registerIfAbsent("lock", TaskLockService::class) {
                         maxParallelUsages = 1
                     }
                 )
-                maxHeapSize = "8g"
             }
         }
     }
 }
-
-tasks.assemble { dependsOn(tasks.named("hammerClasses")) }
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.test-time-consuming.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.test-time-consuming.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.test-time-consuming.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.test-time-consuming.gradle.kts
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.test-timing-sensitive.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.test-timing-sensitive.gradle.kts
similarity index 100%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.feature.test-timing-sensitive.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.test-timing-sensitive.gradle.kts
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.test.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.test.gradle.kts
new file mode 100644
index 000000000000..cc0257f2925b
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.test.gradle.kts
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.hedera.gradle.services.TaskLockService
+
+plugins { id("java") }
+
+@Suppress("UnstableApiUsage")
+testing.suites {
+    named<JvmTestSuite>("test") {
+        useJUnitJupiter()
+        targets.all {
+            testTask {
+                group = "build"
+                maxHeapSize = "4g"
+                // Some tests overlap due to using the same temp folders within one project
+                // maxParallelForks = 4 <- set this, once tests can run in parallel
+            }
+        }
+    }
+    // remove automatically added compile time dependencies, as we define them explicitly
+    withType<JvmTestSuite> {
+        configurations.getByName(sources.implementationConfigurationName) {
+            withDependencies {
+                removeIf { it.group == "org.junit.jupiter" && it.name == "junit-jupiter" }
+            }
+        }
+        dependencies { runtimeOnly("org.junit.jupiter:junit-jupiter-engine") }
+    }
+}
+
+// If user gave the argument '-PactiveProcessorCount', then do:
+// - run all test tasks in sequence
+// - give the -XX:ActiveProcessorCount argument to the test JVMs
+val activeProcessorCount = providers.gradleProperty("activeProcessorCount")
+
+if (activeProcessorCount.isPresent) {
+    tasks.withType<Test>().configureEach {
+        usesService(
+            gradle.sharedServices.registerIfAbsent("lock", TaskLockService::class) {
+                maxParallelUsages = 1
+            }
+        )
+        jvmArgs("-XX:ActiveProcessorCount=${activeProcessorCount.get()}")
+    }
+}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.root.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.versioning.gradle.kts
similarity index 60%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.root.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.versioning.gradle.kts
index a429661c9721..d1a9273f4b43 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.root.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.feature.versioning.gradle.kts
@@ -14,33 +14,15 @@
  * limitations under the License.
  */
 
-import com.hedera.gradle.utils.Utils.generateProjectVersionReport
-import com.hedera.gradle.utils.Utils.versionTxt
 import net.swiftzer.semver.SemVer
 
-plugins {
-    id("com.hedera.gradle.lifecycle")
-    id("com.hedera.gradle.repositories")
-    id("com.hedera.gradle.nexus-publish")
-    id("com.hedera.gradle.spotless-kotlin")
-    id("com.hedera.gradle.spotless-markdown")
-}
-
-spotless {
-    kotlinGradle { target("gradle/plugins/**/*.gradle.kts") }
-    kotlin {
-        // For the Kotlin classes (*.kt files)
-        ktfmt().kotlinlangStyle()
-        target("gradle/plugins/**/*.kt")
-    }
-}
-
-val productVersion = layout.projectDirectory.versionTxt().asFile.readText().trim()
+plugins { id("com.hedera.gradle.base.version") }
 
 tasks.register("githubVersionSummary") {
-    group = "github"
+    group = "versioning"
 
-    inputs.property("version", productVersion)
+    inputs.property("productName", project.name)
+    inputs.property("version", project.version)
 
     if (!providers.environmentVariable("GITHUB_STEP_SUMMARY").isPresent) {
         // Do not throw an exception if running the `gradlew tasks` task
@@ -54,9 +36,18 @@ tasks.register("githubVersionSummary") {
     outputs.file(providers.environmentVariable("GITHUB_STEP_SUMMARY"))
 
     doLast {
-        generateProjectVersionReport(
-            inputs.properties["version"] as String,
-            outputs.files.singleFile.outputStream().buffered()
+        val version = inputs.properties["version"] as String
+        val productName = inputs.properties["productName"] as String
+
+        outputs.files.singleFile.writeText(
+            """
+            ### Deployed Version Information
+            
+            | Artifact Name | Version Number |
+            | --- | --- |
+            | $productName | $version |
+        """
+                .trimIndent()
         )
     }
 }
@@ -64,11 +55,13 @@ tasks.register("githubVersionSummary") {
 tasks.register("showVersion") {
     group = "versioning"
 
-    inputs.property("version", productVersion)
+    inputs.property("version", project.version)
 
     doLast { println(inputs.properties["version"]) }
 }
 
+val versionTxt = layout.projectDirectory.file("version.txt")
+
 tasks.register("versionAsPrefixedCommit") {
     group = "versioning"
 
@@ -82,8 +75,8 @@ tasks.register("versionAsPrefixedCommit") {
             .map { it.trim().substring(0, 7) }
     )
     inputs.property("commitPrefix", providers.gradleProperty("commitPrefix").orElse("adhoc"))
-    inputs.property("version", productVersion)
-    outputs.file(layout.projectDirectory.versionTxt())
+    inputs.property("version", project.version)
+    outputs.file(versionTxt)
 
     doLast {
         val newPrerel =
@@ -99,8 +92,8 @@ tasks.register("versionAsPrefixedCommit") {
 tasks.register("versionAsSnapshot") {
     group = "versioning"
 
-    inputs.property("version", productVersion)
-    outputs.file(layout.projectDirectory.versionTxt())
+    inputs.property("version", project.version)
+    outputs.file(versionTxt)
 
     doLast {
         val currVer = SemVer.parse(inputs.properties["version"] as String)
@@ -113,21 +106,15 @@ tasks.register("versionAsSnapshot") {
 tasks.register("versionAsSpecified") {
     group = "versioning"
 
-    inputs.property("newVersion", providers.gradleProperty("newVersion").orNull)
-
-    if (inputs.properties["newVersion"] == null) {
-        // Do not throw an exception if running the `gradlew tasks` task
-        if (project.gradle.startParameter.taskNames.contains("versionAsSpecified")) {
-            throw IllegalArgumentException(
-                "No newVersion property provided! " +
-                    "Please add the parameter -PnewVersion=<version> when running this task."
-            )
-        }
-    }
-    outputs.file(layout.projectDirectory.versionTxt())
+    inputs.property("newVersion", providers.gradleProperty("newVersion")).optional(true)
 
     doLast {
-        val newVer = SemVer.parse(inputs.properties["newVersion"] as String)
-        outputs.files.singleFile.writeText(newVer.toString())
+        val newVer =
+            inputs.properties["newVersion"] as String?
+                ?: throw IllegalArgumentException(
+                    "No newVersion property provided! " +
+                        "Please add the parameter -PnewVersion=<version> when running this task."
+                )
+        outputs.files.singleFile.writeText(SemVer.parse(newVer).toString())
     }
 }
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.module.application.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.module.application.gradle.kts
new file mode 100644
index 000000000000..30ff4dce2f83
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.module.application.gradle.kts
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2016-2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("application")
+    id("jacoco")
+    id("com.hedera.gradle.base.jpms-modules")
+    id("com.hedera.gradle.base.lifecycle")
+    id("com.hedera.gradle.base.version")
+    id("com.hedera.gradle.check.dependencies")
+    id("com.hedera.gradle.check.spotless")
+    id("com.hedera.gradle.check.spotless-java")
+    id("com.hedera.gradle.check.spotless-kotlin")
+    id("com.hedera.gradle.feature.git-properties-file")
+    id("com.hedera.gradle.feature.java-compile")
+    id("com.hedera.gradle.feature.java-doc")
+    id("com.hedera.gradle.feature.java-execute")
+    id("com.hedera.gradle.feature.test")
+    id("com.hedera.gradle.report.test-logger")
+}
+
+// Make the Jar itself executable by setting the 'Main-Class' manifest attribute.
+tasks.jar { manifest { attributes("Main-Class" to application.mainClass) } }
+
+// The 'application' plugin activates the following tasks as part of 'assemble'.
+// As we do not use these results right now, disable them:
+tasks.startScripts { enabled = false }
+
+tasks.distTar { enabled = false }
+
+tasks.distZip { enabled = false }
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.module.java-library.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.module.java-library.gradle.kts
new file mode 100644
index 000000000000..b6e88d04b500
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.module.java-library.gradle.kts
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("java-library")
+    id("com.hedera.gradle.feature.publish-maven-central")
+    id("jacoco")
+    id("com.hedera.gradle.base.jpms-modules")
+    id("com.hedera.gradle.base.lifecycle")
+    id("com.hedera.gradle.base.version")
+    id("com.hedera.gradle.check.dependencies")
+    id("com.hedera.gradle.check.spotless")
+    id("com.hedera.gradle.check.spotless-java")
+    id("com.hedera.gradle.check.spotless-kotlin")
+    id("com.hedera.gradle.feature.git-properties-file")
+    id("com.hedera.gradle.feature.java-compile")
+    id("com.hedera.gradle.feature.java-doc")
+    id("com.hedera.gradle.feature.java-execute")
+    id("com.hedera.gradle.feature.test")
+    id("com.hedera.gradle.report.test-logger")
+}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.versions.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.report.code-coverage.gradle.kts
similarity index 69%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.versions.gradle.kts
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.report.code-coverage.gradle.kts
index 661037d92d75..9ca1b722d204 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.versions.gradle.kts
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.report.code-coverage.gradle.kts
@@ -15,11 +15,10 @@
  */
 
 plugins {
-    id("java-platform")
-    id("com.hedera.gradle.jpms-modules")
-    id("org.gradlex.java-module-versions")
+    id("java")
+    id("jacoco-report-aggregation")
+    id("com.hedera.gradle.base.jpms-modules")
 }
 
-javaPlatform { allowDependencies() }
-
-tasks.register("releaseMavenCentral")
+// Make aggregation "classpath" use the platform for versions (gradle/versions)
+configurations.aggregateCodeCoverageReportResults { extendsFrom(configurations["internal"]) }
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.report.develocity.settings.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.report.develocity.settings.gradle.kts
new file mode 100644
index 000000000000..c867e62c8881
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.report.develocity.settings.gradle.kts
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins { id("com.gradle.develocity") }
+
+develocity {
+    buildScan {
+        termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
+        termsOfUseAgree = "yes"
+        // Enable Gradle Build Scan only with explicit '--scan'
+        publishing.onlyIf { false }
+    }
+}
diff --git a/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.report.test-logger.gradle.kts b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.report.test-logger.gradle.kts
new file mode 100644
index 000000000000..73509ad869f5
--- /dev/null
+++ b/gradle/hedera-gradle-conventions/src/main/kotlin/com.hedera.gradle.report.test-logger.gradle.kts
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.adarshr.gradle.testlogger.theme.ThemeType
+
+plugins { id("com.adarshr.test-logger") }
+
+testlogger {
+    theme = ThemeType.MOCHA_PARALLEL
+    slowThreshold = 10000
+    showPassed = false
+    showSkipped = false
+    showStandardStreams = true
+    showPassedStandardStreams = false
+    showSkippedStandardStreams = false
+    showFailedStandardStreams = true
+}
diff --git a/gradle/plugins/src/main/kotlin/com/hedera/gradle/services/TaskLockService.kt b/gradle/hedera-gradle-conventions/src/main/kotlin/com/hedera/gradle/services/TaskLockService.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/com/hedera/gradle/services/TaskLockService.kt
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com/hedera/gradle/services/TaskLockService.kt
diff --git a/gradle/plugins/src/main/kotlin/com/hedera/gradle/spotless/RepairDashedCommentsFormatterStep.kt b/gradle/hedera-gradle-conventions/src/main/kotlin/com/hedera/gradle/spotless/RepairDashedCommentsFormatterStep.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/com/hedera/gradle/spotless/RepairDashedCommentsFormatterStep.kt
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com/hedera/gradle/spotless/RepairDashedCommentsFormatterStep.kt
diff --git a/gradle/plugins/src/main/kotlin/com/hedera/gradle/spotless/SortModuleInfoRequiresStep.kt b/gradle/hedera-gradle-conventions/src/main/kotlin/com/hedera/gradle/spotless/SortModuleInfoRequiresStep.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/com/hedera/gradle/spotless/SortModuleInfoRequiresStep.kt
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com/hedera/gradle/spotless/SortModuleInfoRequiresStep.kt
diff --git a/gradle/plugins/src/main/kotlin/com/hedera/gradle/spotless/StripOldLicenseFormatterStep.kt b/gradle/hedera-gradle-conventions/src/main/kotlin/com/hedera/gradle/spotless/StripOldLicenseFormatterStep.kt
similarity index 100%
rename from gradle/plugins/src/main/kotlin/com/hedera/gradle/spotless/StripOldLicenseFormatterStep.kt
rename to gradle/hedera-gradle-conventions/src/main/kotlin/com/hedera/gradle/spotless/StripOldLicenseFormatterStep.kt
diff --git a/gradle/jdk-version.txt b/gradle/jdk-version.txt
new file mode 100644
index 000000000000..f222bf6f4c7a
--- /dev/null
+++ b/gradle/jdk-version.txt
@@ -0,0 +1 @@
+21.0.4
diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts
index 516916b559d4..5b4d2955b282 100644
--- a/gradle/plugins/build.gradle.kts
+++ b/gradle/plugins/build.gradle.kts
@@ -14,28 +14,6 @@
  * limitations under the License.
  */
 
-plugins {
-    // Support convention plugins written in Kotlin. Convention plugins are build scripts in
-    // 'src/main' that automatically become available as plugins in the main build.
-    `kotlin-dsl`
-}
+plugins { `kotlin-dsl` }
 
 repositories { gradlePluginPortal() }
-
-dependencies {
-    implementation("com.adarshr:gradle-test-logger-plugin:4.0.0")
-    implementation("com.autonomousapps:dependency-analysis-gradle-plugin:2.0.1")
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
-    implementation("com.github.johnrengelman:shadow:8.1.1")
-    implementation("com.google.protobuf:protobuf-gradle-plugin:0.9.4")
-    implementation("com.gradle:develocity-gradle-plugin:3.18")
-    implementation(
-        "gradle.plugin.com.google.cloud.artifactregistry:artifactregistry-gradle-plugin:2.2.2"
-    )
-    implementation("io.github.gradle-nexus:publish-plugin:1.3.0")
-    implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
-    implementation("net.swiftzer.semver:semver:1.3.0")
-    implementation("org.gradlex:extra-java-module-info:1.8")
-    implementation("org.gradlex:jvm-dependency-conflict-resolution:2.1.2")
-    implementation("org.gradlex:java-module-dependencies:1.7")
-}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.java.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.java.gradle.kts
deleted file mode 100644
index 952617228c71..000000000000
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.java.gradle.kts
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import com.adarshr.gradle.testlogger.theme.ThemeType
-import com.autonomousapps.DependencyAnalysisSubExtension
-import com.hedera.gradle.services.TaskLockService
-import com.hedera.gradle.utils.Utils.versionTxt
-import org.gradlex.javamodule.dependencies.tasks.ModuleDirectivesOrderingCheck
-import org.gradlex.javamodule.dependencies.tasks.ModuleDirectivesScopeCheck
-
-plugins {
-    id("java")
-    id("jacoco")
-    id("checkstyle")
-    id("com.adarshr.test-logger")
-    id("com.autonomousapps.dependency-analysis")
-    id("com.hedera.gradle.lifecycle")
-    id("com.hedera.gradle.jpms-modules")
-    id("com.hedera.gradle.repositories")
-    id("com.hedera.gradle.spotless-java")
-    id("com.hedera.gradle.spotless-kotlin")
-}
-
-version =
-    providers.fileContents(rootProject.layout.projectDirectory.versionTxt()).asText.get().trim()
-
-val javaVersionMajor = JavaVersion.VERSION_21
-val javaVersionPatch = "0.4"
-
-val currentJavaVersionMajor = JavaVersion.current()
-val currentJavaVersion = providers.systemProperty("java.version").get()
-val expectedJavaVersion = "$javaVersionMajor.$javaVersionPatch"
-
-if (currentJavaVersion != expectedJavaVersion) {
-    val message =
-        "Gradle runs with Java $currentJavaVersion. This project works best running with Java $expectedJavaVersion. " +
-            "\n - From commandline: change JAVA_HOME and/or PATH to point at Java $expectedJavaVersion installation." +
-            "\n - From IntelliJ: change 'Gradle JVM' in 'Gradle Settings' to point at Java $expectedJavaVersion installation."
-
-    if (currentJavaVersionMajor.ordinal < javaVersionMajor.ordinal) { // fail if version is too old
-        throw (RuntimeException(message))
-    } else {
-        logger.lifecycle("WARN: $message")
-    }
-}
-
-java {
-    sourceCompatibility = javaVersionMajor
-    targetCompatibility = javaVersionMajor
-}
-
-configurations.all {
-    // In case published versions of a module are also available, always prefer the local one
-    resolutionStrategy.preferProjectModules()
-}
-
-jvmDependencyConflicts {
-    consistentResolution {
-        providesVersions(":app")
-        platform(":hedera-dependency-versions")
-    }
-}
-
-configurations.javaModulesMergeJars { extendsFrom(configurations["internal"]) }
-
-tasks.buildDependents { setGroup(null) }
-
-tasks.buildNeeded { setGroup(null) }
-
-tasks.jar { setGroup(null) }
-
-sourceSets.all {
-    // Remove 'classes' tasks from 'build' group to keep it cleaned up
-    tasks.named(classesTaskName) { group = null }
-
-    // 'assemble' compiles all sources, including all test sources
-    tasks.assemble { dependsOn(tasks.named(classesTaskName)) }
-}
-
-val writeGitProperties =
-    tasks.register<WriteProperties>("writeGitProperties") {
-        property("git.build.version", project.version)
-        @Suppress("UnstableApiUsage")
-        property(
-            "git.commit.id",
-            providers
-                .exec { commandLine("git", "rev-parse", "HEAD") }
-                .standardOutput
-                .asText
-                .map { it.trim() }
-        )
-        @Suppress("UnstableApiUsage")
-        property(
-            "git.commit.id.abbrev",
-            providers
-                .exec { commandLine("git", "rev-parse", "HEAD") }
-                .standardOutput
-                .asText
-                .map { it.trim().substring(0, 7) }
-        )
-
-        destinationFile = layout.buildDirectory.file("generated/git/git.properties")
-    }
-
-tasks.processResources { from(writeGitProperties) }
-
-// ignore the content of 'git.properties' when using a classpath as task input
-normalization.runtimeClasspath { ignore("git.properties") }
-
-tasks.withType<AbstractArchiveTask>().configureEach {
-    isPreserveFileTimestamps = false
-    isReproducibleFileOrder = true
-    filePermissions { unix("0664") }
-    dirPermissions { unix("0775") }
-}
-
-tasks.jar { exclude("**/classpath.index") }
-
-val deactivatedCompileLintOptions =
-    listOf(
-        // In Gradle, a module does not see the upstream (not-yet-compiled) modules. This could
-        // only be solved by calling 'javac' with '--source-module-path' to make other sources
-        // known. But this is at odds with how Gradle's incremental compilation calls the
-        // compiler for a subset of Java files for each project individually.
-        "module", // module not found when doing 'exports to ...'
-        "serial", // serializable class ... has no definition of serialVersionUID
-        "processing", // No processor claimed any of these annotations: ...
-        "try", // auto-closeable resource ignore is never referenced... (AutoClosableLock)
-        "missing-explicit-ctor", // class ... declares no explicit constructors
-
-        // Needed because we use deprecation internally and do not fix all uses right away
-        "removal",
-        "deprecation",
-
-        // The following checks could be activated and fixed:
-        "this-escape", // calling public/protected method in constructor
-        "overrides", // overrides equals, but neither it ... overrides hashCode method
-        "unchecked",
-        "rawtypes"
-    )
-
-tasks.withType<JavaCompile>().configureEach {
-    // Track the full Java version as input (e.g. 17.0.3 vs. 17.0.9).
-    // By default, Gradle only tracks the major version as defined in the toolchain (e.g. 17).
-    // Since the full version is encoded in 'module-info.class' files, it should be tracked as
-    // it otherwise leads to wrong build cache hits.
-    inputs.property("fullJavaVersion", currentJavaVersion)
-
-    options.encoding = "UTF-8"
-    options.isFork = true // run compiler in separate JVM process (independent of toolchain setup)
-    options.compilerArgs.add("-implicit:none")
-    options.compilerArgs.add("-Werror")
-    options.compilerArgs.add("-Xlint:all,-" + deactivatedCompileLintOptions.joinToString(",-"))
-
-    doLast {
-        // Make sure consistent line ending are used in files generated by annotation processors by
-        // rewriting generated files.
-        // To fix this problem at the root, one of these issues needs to be addressed upstream:
-        // - https://github.com/google/auto/issues/1656
-        // - https://github.com/gradle/gradle/issues/27385
-        if (System.lineSeparator() != "\n") {
-            destinationDirectory
-                .get()
-                .asFileTree
-                .filter { it.extension != "class" }
-                .forEach {
-                    val content = it.readText()
-                    val normalizedContent = content.replace(System.lineSeparator(), "\n")
-                    if (content != normalizedContent) {
-                        it.writeText(normalizedContent)
-                    }
-                }
-        }
-    }
-}
-
-tasks.withType<Javadoc>().configureEach {
-    options {
-        this as StandardJavadocDocletOptions
-        encoding = "UTF-8"
-        tags(
-            "apiNote:a:API Note:",
-            "implSpec:a:Implementation Requirements:",
-            "implNote:a:Implementation Note:"
-        )
-        options.windowTitle = "Hedera Consensus Node"
-        options.memberLevel = JavadocMemberLevel.PACKAGE
-        addStringOption("Xdoclint:all,-missing", "-Xwerror")
-    }
-}
-
-@Suppress("UnstableApiUsage")
-testing.suites {
-    named<JvmTestSuite>("test") {
-        useJUnitJupiter()
-        targets.all {
-            testTask {
-                group = "build"
-                maxHeapSize = "4g"
-                // Some tests overlap due to using the same temp folders within one project
-                // maxParallelForks = 4 <- set this, once tests can run in parallel
-            }
-        }
-    }
-    // remove automatically added compile time dependencies, as we want to define them all
-    // explicitly
-    withType<JvmTestSuite> {
-        configurations.getByName(sources.implementationConfigurationName) {
-            withDependencies {
-                removeIf { it.group == "org.junit.jupiter" && it.name == "junit-jupiter" }
-            }
-        }
-        dependencies { runtimeOnly("org.junit.jupiter:junit-jupiter-engine") }
-    }
-}
-
-// If user gave the argument '-PactiveProcessorCount', then do:
-// - run all test tasks in sequence
-// - give the -XX:ActiveProcessorCount argument to the test JVMs
-val activeProcessorCount = providers.gradleProperty("activeProcessorCount")
-
-if (activeProcessorCount.isPresent) {
-    tasks.withType<Test>().configureEach {
-        usesService(
-            gradle.sharedServices.registerIfAbsent("lock", TaskLockService::class) {
-                maxParallelUsages = 1
-            }
-        )
-        jvmArgs("-XX:ActiveProcessorCount=${activeProcessorCount.get()}")
-    }
-}
-
-tasks.jacocoTestReport {
-    // Configure Jacoco so it outputs XML reports (needed by SonarCloud)
-    reports {
-        xml.required = true
-        html.required = true
-    }
-}
-
-testlogger {
-    theme = ThemeType.MOCHA_PARALLEL
-    slowThreshold = 10000
-    showPassed = false
-    showSkipped = false
-    showStandardStreams = true
-    showPassedStandardStreams = false
-    showSkippedStandardStreams = false
-    showFailedStandardStreams = true
-}
-
-tasks.assemble { dependsOn(tasks.javadoc) }
-
-tasks.check { dependsOn(tasks.jacocoTestReport) }
-
-tasks.named("qualityGate") { dependsOn(tasks.withType<ModuleDirectivesScopeCheck>()) }
-
-// ordering check is done by SortModuleInfoRequiresStep
-tasks.withType<ModuleDirectivesOrderingCheck> { enabled = false }
-
-tasks.withType<JavaCompile>().configureEach {
-    // When doing a 'qualityGate' run, make sure spotlessApply is done before doing compilation and
-    // other checks based on compiled code
-    mustRunAfter(tasks.spotlessApply)
-}
-
-// Do not report dependencies from one source set to another as 'required'.
-// In particular, in case of test fixtures, the analysis would suggest to
-// add as testModuleInfo { require(...) } to the main module. This is
-// conceptually wrong, because in whitebox testing the 'main' and 'test'
-// module are conceptually considered one module (main module extended with tests)
-configure<DependencyAnalysisSubExtension> { issues { onAny { exclude(project.path) } } }
-
-checkstyle { toolVersion = "10.12.7" }
-
-tasks.withType<Checkstyle>().configureEach {
-    reports {
-        xml.required = true
-        html.required = true
-        sarif.required = true
-    }
-}
-
-tasks.withType<JavaExec>().configureEach {
-    // Do not yet run things on the '--module-path'
-    modularity.inferModulePath = false
-    if (name.endsWith("main()")) {
-        notCompatibleWithConfigurationCache("JavaExec created by IntelliJ")
-    }
-}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.maven-publish.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.maven-publish.gradle.kts
deleted file mode 100644
index fbc9dd85100f..000000000000
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.maven-publish.gradle.kts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2016-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    id("java")
-    id("maven-publish")
-    id("signing")
-}
-
-java {
-    withJavadocJar()
-    withSourcesJar()
-}
-
-tasks.withType<Jar>().configureEach { setGroup(null) }
-
-tasks.named("releaseMavenCentral") {
-    group = "release"
-    dependsOn(tasks.named("publishToSonatype"))
-}
-
-val maven =
-    publishing.publications.create<MavenPublication>("maven") {
-        from(components["java"])
-        versionMapping {
-            // Everything published takes the versions from the resolution result.
-            // These are the versions we define in 'hedera-dependency-versions'
-            // and use consistently in all modules.
-            allVariants { fromResolutionResult() }
-        }
-
-        pom {
-            packaging = findProperty("maven.project.packaging")?.toString() ?: "jar"
-            name.set(project.name)
-            url.set("https://www.swirlds.com/")
-            inceptionYear.set("2016")
-
-            description.set(provider(project::getDescription))
-
-            organization {
-                name.set("Hedera Hashgraph, LLC")
-                url.set("https://www.hedera.com")
-            }
-
-            licenses {
-                license {
-                    name.set("Apache License, Version 2.0")
-                    url.set(
-                        "https://raw.githubusercontent.com/hashgraph/hedera-services/main/LICENSE"
-                    )
-                }
-            }
-
-            scm {
-                connection.set("scm:git:git://github.com/hashgraph/hedera-services.git")
-                developerConnection.set("scm:git:ssh://github.com:hashgraph/hedera-services.git")
-                url.set("https://github.com/hashgraph/hedera-services")
-            }
-        }
-    }
-
-val publishSigningEnabled =
-    providers.gradleProperty("publishSigningEnabled").getOrElse("false").toBoolean()
-
-if (publishSigningEnabled) {
-    signing {
-        sign(maven)
-        useGpgCmd()
-    }
-}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.platform-publish.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.platform-publish.gradle.kts
deleted file mode 100644
index 79fd23a0ad23..000000000000
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.platform-publish.gradle.kts
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    id("java")
-    id("com.hedera.gradle.maven-publish")
-}
-
-if (
-    gradle.startParameter.taskNames.any { it.startsWith("release") || it.contains("MavenCentral") }
-) {
-    // We apply the 'artifactregistry' plugin conditionally, as there are two issues:
-    // 1. It does not support configuration cache.
-    //    https://github.com/GoogleCloudPlatform/artifact-registry-maven-tools/issues/85
-    // 2. It does not interact well with the 'gradle-nexus.publish-plugin' plugin, causing:
-    //    'No staging repository with name sonatype created' during IDE import
-    publishing.repositories.remove(publishing.repositories.getByName("sonatype"))
-    apply(plugin = "com.google.cloud.artifactregistry.gradle-plugin")
-}
-
-// Publishing tasks are only enabled if we publish to the matching group.
-// Otherwise, Nexus configuration and credentials do not fit.
-val publishingPackageGroup = providers.gradleProperty("publishingPackageGroup").getOrElse("")
-
-tasks.withType<PublishToMavenRepository>().configureEach {
-    enabled = publishingPackageGroup == "com.swirlds"
-}
-
-publishing.publications.named<MavenPublication>("maven") {
-    pom.description =
-        "Swirlds is a software platform designed to build fully-distributed " +
-            "applications that harness the power of the cloud without servers. " +
-            "Now you can develop applications with fairness in decision making, " +
-            "speed, trust and reliability, at a fraction of the cost of " +
-            "traditional server-based platforms."
-
-    pom.developers {
-        developer {
-            name = "Platform Base Team"
-            email = "platform-base@swirldslabs.com"
-            organization = "Hedera Hashgraph"
-            organizationUrl = "https://www.hedera.com"
-        }
-        developer {
-            name = "Platform Hashgraph Team"
-            email = "platform-hashgraph@swirldslabs.com"
-            organization = "Hedera Hashgraph"
-            organizationUrl = "https://www.hedera.com"
-        }
-        developer {
-            name = "Platform Data Team"
-            email = "platform-data@swirldslabs.com"
-            organization = "Hedera Hashgraph"
-            organizationUrl = "https://www.hedera.com"
-        }
-        developer {
-            name = "Release Engineering Team"
-            email = "release-engineering@swirldslabs.com"
-            organization = "Hedera Hashgraph"
-            organizationUrl = "https://www.hedera.com"
-        }
-    }
-}
-
-publishing.repositories {
-    maven("artifactregistry://us-maven.pkg.dev/swirlds-registry/maven-prerelease-channel") {
-        name = "prereleaseChannel"
-    }
-    maven("artifactregistry://us-maven.pkg.dev/swirlds-registry/maven-develop-snapshots") {
-        name = "developSnapshot"
-    }
-    maven("artifactregistry://us-maven.pkg.dev/swirlds-registry/maven-develop-daily-snapshots") {
-        name = "developDailySnapshot"
-    }
-    maven("artifactregistry://us-maven.pkg.dev/swirlds-registry/maven-develop-commits") {
-        name = "developCommit"
-    }
-    maven("artifactregistry://us-maven.pkg.dev/swirlds-registry/maven-adhoc-commits") {
-        name = "adhocCommit"
-    }
-}
-
-// Register one 'release*' task for each publishing repository
-publishing.repositories.all {
-    val ucName = name.replaceFirstChar { it.titlecase() }
-    tasks.register("release$ucName") {
-        group = "release"
-        dependsOn(tasks.named("publishMavenPublicationTo${ucName}Repository"))
-    }
-}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.reports.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.reports.gradle.kts
deleted file mode 100644
index 22a013a951d3..000000000000
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.reports.gradle.kts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    id("jvm-ecosystem")
-    id("jacoco-report-aggregation")
-    id("com.hedera.gradle.lifecycle")
-    id("com.hedera.gradle.repositories")
-    id("com.hedera.gradle.jpms-modules")
-}
-
-dependencies {
-    rootProject.subprojects
-        // exclude the 'reports' project itself
-        .filter { prj -> prj != project }
-        // exclude 'test-clients' as it contains test sources in 'main'
-        // see also 'codecov.yml'
-        .filter { prj -> prj.name != "test-clients" }
-        .forEach {
-            if (it.name == "hedera-dependency-versions") {
-                jacocoAggregation(platform(project(it.path)))
-            } else {
-                jacocoAggregation(project(it.path))
-            }
-        }
-}
-
-// Use Gradle's 'jacoco-report-aggregation' plugin to create an aggregated report independent of the
-// platform (Codecov, Codacy, ...) that picks it up later on.
-// See:
-// https://docs.gradle.org/current/samples/sample_jvm_multi_project_with_code_coverage_standalone.html
-reporting {
-    reports.create<JacocoCoverageReport>("testCodeCoverageReport") {
-        testType = TestSuiteType.UNIT_TEST
-    }
-}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.repositories.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.repositories.gradle.kts
deleted file mode 100644
index 734cf240f7eb..000000000000
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.repositories.gradle.kts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2016-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-repositories {
-    mavenCentral()
-    maven { url = uri("https://us-maven.pkg.dev/swirlds-registry/maven-prerelease-channel") }
-    maven { url = uri("https://us-maven.pkg.dev/swirlds-registry/maven-develop-commits") }
-    maven { url = uri("https://us-maven.pkg.dev/swirlds-registry/maven-adhoc-commits") }
-    maven { url = uri("https://us-maven.pkg.dev/swirlds-registry/maven-develop-daily-snapshots") }
-    maven { url = uri("https://us-maven.pkg.dev/swirlds-registry/maven-develop-snapshots") }
-    maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
-    maven {
-        url = uri("https://hyperledger.jfrog.io/artifactory/besu-maven")
-        content { includeGroupByRegex("org\\.hyperledger\\..*") }
-    }
-    maven {
-        url = uri("https://artifacts.consensys.net/public/maven/maven/")
-        content { includeGroupByRegex("tech\\.pegasys(\\..*)?") }
-    }
-    maven { url = uri("https://oss.sonatype.org/content/repositories/comhederahashgraph-1502") }
-    maven { url = uri("https://oss.sonatype.org/content/repositories/comhederahashgraph-1531") }
-}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.services-publish.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.services-publish.gradle.kts
deleted file mode 100644
index 4bae581a0fd3..000000000000
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.services-publish.gradle.kts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    id("java")
-    id("com.hedera.gradle.maven-publish")
-}
-
-// Publishing tasks are only enabled if we publish to the matching group.
-// Otherwise, Nexus configuration and credentials do not fit.
-val publishingPackageGroup = providers.gradleProperty("publishingPackageGroup").getOrElse("")
-
-tasks.withType<PublishToMavenRepository>().configureEach {
-    enabled = publishingPackageGroup == "com.hedera"
-}
-
-publishing {
-    publications {
-        named<MavenPublication>("maven") {
-            pom.developers {
-                developer {
-                    name = "Hedera Base Team"
-                    email = "hedera-base@swirldslabs.com"
-                    organization = "Hedera Hashgraph"
-                    organizationUrl = "https://www.hedera.com"
-                }
-                developer {
-                    name = "Hedera Services Team"
-                    email = "hedera-services@swirldslabs.com"
-                    organization = "Hedera Hashgraph"
-                    organizationUrl = "https://www.hedera.com"
-                }
-                developer {
-                    name = "Hedera Smart Contracts Team"
-                    email = "hedera-smart-contracts@swirldslabs.com"
-                    organization = "Hedera Hashgraph"
-                    organizationUrl = "https://www.hedera.com"
-                }
-                developer {
-                    name = "Release Engineering Team"
-                    email = "release-engineering@swirldslabs.com"
-                    organization = "Hedera Hashgraph"
-                    organizationUrl = "https://www.hedera.com"
-                }
-            }
-        }
-    }
-}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.settings.settings.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.settings.settings.gradle.kts
deleted file mode 100644
index 3e3c4ccff566..000000000000
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.settings.settings.gradle.kts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        mavenCentral()
-        maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
-    }
-}
-
-plugins {
-    id("com.gradle.develocity")
-    id("org.gradlex.java-module-dependencies")
-}
-
-// Enable Gradle Build Scan
-develocity {
-    buildScan {
-        termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
-        termsOfUseAgree = "yes"
-        publishing.onlyIf { false } // only publish with explicit '--scan'
-    }
-}
-
-val isCiServer = System.getenv().containsKey("CI")
-val gradleCacheUsername: String? = System.getenv("GRADLE_CACHE_USERNAME")
-val gradleCachePassword: String? = System.getenv("GRADLE_CACHE_PASSWORD")
-val gradleCacheAuthorized =
-    (gradleCacheUsername?.isNotEmpty() ?: false) && (gradleCachePassword?.isNotEmpty() ?: false)
-
-buildCache {
-    remote<HttpBuildCache> {
-        url = uri("https://cache.gradle.hedera.svcs.eng.swirldslabs.io/cache/")
-        isPush = isCiServer && gradleCacheAuthorized
-
-        isUseExpectContinue = true
-        isEnabled = !gradle.startParameter.isOffline
-
-        if (isCiServer && gradleCacheAuthorized) {
-            credentials {
-                username = gradleCacheUsername
-                password = gradleCachePassword
-            }
-        }
-    }
-}
-
-// Allow projects inside a build to be addressed by dependency coordinates notation.
-// https://docs.gradle.org/current/userguide/composite_builds.html#included_build_declaring_substitutions
-// Some functionality of the 'java-module-dependencies' plugin relies on this.
-includeBuild(".")
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.shadow-jar.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.gradle.shadow-jar.gradle.kts
deleted file mode 100644
index d2bf1148e4d5..000000000000
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.shadow-jar.gradle.kts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import com.github.jengelman.gradle.plugins.shadow.internal.DefaultDependencyFilter
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
-plugins {
-    id("java")
-    id("com.github.johnrengelman.shadow")
-}
-
-tasks.withType<ShadowJar>().configureEach {
-    group = "shadow"
-    from(sourceSets.main.get().output)
-    mergeServiceFiles()
-
-    // There is an issue in the shadow plugin that it automatically accesses the
-    // files in 'runtimeClasspath' while Gradle is building the task graph.
-    // See: https://github.com/johnrengelman/shadow/issues/882
-    dependencyFilter = NoResolveDependencyFilter()
-}
-
-class NoResolveDependencyFilter : DefaultDependencyFilter(project) {
-    override fun resolve(configuration: FileCollection): FileCollection {
-        return configuration
-    }
-}
diff --git a/gradle/plugins/src/main/kotlin/com.hedera.gradle.application.gradle.kts b/gradle/plugins/src/main/kotlin/com.hedera.services.gradle.feature.copy-to-sdk.gradle.kts
similarity index 75%
rename from gradle/plugins/src/main/kotlin/com.hedera.gradle.application.gradle.kts
rename to gradle/plugins/src/main/kotlin/com.hedera.services.gradle.feature.copy-to-sdk.gradle.kts
index b821df2958c4..66ad0f95f80f 100644
--- a/gradle/plugins/src/main/kotlin/com.hedera.gradle.application.gradle.kts
+++ b/gradle/plugins/src/main/kotlin/com.hedera.services.gradle.feature.copy-to-sdk.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2024 Hedera Hashgraph, LLC
+ * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("application")
-    id("com.hedera.gradle.java")
-}
+plugins { id("java") }
 
 // Find the central SDK deployment dir by searching up the folder hierarchy
 fun sdkDir(dir: Directory): Directory =
@@ -44,13 +41,3 @@ tasks.assemble {
     dependsOn(copyLib)
     dependsOn(copyApp)
 }
-
-// The 'application' plugin activates the following tasks as part of 'assemble'.
-// As we do not use these results right now, disable them:
-tasks.startScripts { enabled = false }
-
-tasks.distTar { enabled = false }
-
-tasks.distZip { enabled = false }
-
-tasks.jar { manifest { attributes("Main-Class" to application.mainClass) } }
diff --git a/gradle/plugins/src/main/kotlin/com/hedera/gradle/utils/Utils.kt b/gradle/plugins/src/main/kotlin/com/hedera/gradle/utils/Utils.kt
deleted file mode 100644
index 948ce171e8b6..000000000000
--- a/gradle/plugins/src/main/kotlin/com/hedera/gradle/utils/Utils.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2022-2024 Hedera Hashgraph, LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hedera.gradle.utils
-
-import java.io.OutputStream
-import java.io.PrintStream
-import org.gradle.api.file.Directory
-import org.gradle.api.file.RegularFile
-
-object Utils {
-    // Find the version.txt in the root of the repository, independent of
-    // which build is started from where.
-    @JvmStatic
-    fun Directory.versionTxt(): RegularFile =
-        file("version.txt").let { if (it.asFile.exists()) it else this.dir("..").versionTxt() }
-
-    @JvmStatic
-    fun generateProjectVersionReport(version: String, ostream: OutputStream) {
-        val writer = PrintStream(ostream, false, Charsets.UTF_8)
-
-        ostream.use {
-            writer.use {
-                // Writer headers
-                writer.println("### Deployed Version Information")
-                writer.println()
-                writer.println("| Artifact Name | Version Number |")
-                writer.println("| --- | --- |")
-                // Write table rows
-                writer.printf("| %s | %s |\n", "hedera-node", version)
-                writer.printf("| %s | %s |\n", "platform-sdk", version)
-                writer.flush()
-                ostream.flush()
-            }
-        }
-    }
-}
diff --git a/gradle/reports/build.gradle.kts b/gradle/reports/build.gradle.kts
index c4ea91df8da6..5be4966e083e 100644
--- a/gradle/reports/build.gradle.kts
+++ b/gradle/reports/build.gradle.kts
@@ -1,3 +1,15 @@
 plugins {
-    id("com.hedera.gradle.reports")
+    id("com.hedera.gradle.report.code-coverage")
+}
+
+dependencies {
+    implementation(project(":app"))
+    implementation(project(":swirlds-platform-base-example"))
+    implementation(project(":AddressBookTestingTool"))
+    implementation(project(":ConsistencyTestingTool"))
+    implementation(project(":ISSTestingTool"))
+    implementation(project(":MigrationTestingTool"))
+    implementation(project(":PlatformTestingTool"))
+    implementation(project(":StatsSigningTestingTool"))
+    implementation(project(":StressTestingTool"))
 }
diff --git a/hapi/build.gradle.kts b/hapi/build.gradle.kts
index 038b71174a15..2441a7046a47 100644
--- a/hapi/build.gradle.kts
+++ b/hapi/build.gradle.kts
@@ -15,10 +15,10 @@
  */
 
 plugins {
-    id("com.hedera.gradle.protobuf")
-    id("com.hedera.gradle.services-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.protobuf")
     id("com.hedera.gradle.feature.test-fixtures")
-    alias(libs.plugins.pbj)
+    id("com.hedera.pbj.pbj-compiler") version "0.9.2"
 }
 
 description = "Hedera API"
diff --git a/hapi/src/main/java/module-info.java b/hapi/src/main/java/module-info.java
index 6974ac77a250..efbe9c7e9a5e 100644
--- a/hapi/src/main/java/module-info.java
+++ b/hapi/src/main/java/module-info.java
@@ -71,5 +71,4 @@
     requires io.grpc.protobuf;
     requires org.antlr.antlr4.runtime;
     requires static com.github.spotbugs.annotations;
-    requires static java.annotation;
 }
diff --git a/hedera-cryptography/developers.properties b/hedera-cryptography/developers.properties
new file mode 100644
index 000000000000..8acd5e1ea94e
--- /dev/null
+++ b/hedera-cryptography/developers.properties
@@ -0,0 +1,4 @@
+platform-base@swirldslabs.com=Platform Base Team
+platform-hashgraph@swirldslabs.com=Platform Hashgraph Team
+platform-data@swirldslabs.com=Platform Data Team
+release-engineering@swirldslabs.com=Release Engineering Team
diff --git a/hedera-cryptography/hedera-cryptography-tss/build.gradle.kts b/hedera-cryptography/hedera-cryptography-tss/build.gradle.kts
index ccda3f181d08..15f502ba81ba 100644
--- a/hedera-cryptography/hedera-cryptography-tss/build.gradle.kts
+++ b/hedera-cryptography/hedera-cryptography-tss/build.gradle.kts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.platform") }
+plugins { id("com.hedera.gradle.module.java-library") }
 
 testModuleInfo {
     requires("com.hedera.cryptography.pairings.api")
diff --git a/hedera-dependency-versions/build.gradle.kts b/hedera-dependency-versions/build.gradle.kts
index ff0388693f44..8ae54303f172 100644
--- a/hedera-dependency-versions/build.gradle.kts
+++ b/hedera-dependency-versions/build.gradle.kts
@@ -15,14 +15,17 @@
  */
 
 plugins {
-    id("com.hedera.gradle.versions")
+    id("com.hedera.gradle.base.lifecycle")
+    id("com.hedera.gradle.base.jpms-modules")
 }
 
 dependencies {
     api(enforcedPlatform("io.netty:netty-bom:4.1.110.Final"))
 
     // forward logging from modules using SLF4J (e.g. 'org.hyperledger.besu.evm') to Log4J
-    runtime(javaModuleDependencies.gav("org.apache.logging.log4j.slf4j2.impl"))
+    runtime("org.apache.logging.log4j:log4j-slf4j2-impl") {
+        because("org.apache.logging.log4j.slf4j2.impl")
+    }
 }
 
 dependencies.constraints {
@@ -56,10 +59,10 @@ dependencies.constraints {
     api("com.google.jimfs:jimfs:1.2") {
         because("com.google.jimfs")
     }
-    api("com.google.protobuf:protobuf-java:3.21.7") {
+    api("com.google.protobuf:protobuf-java:3.25.4") {
         because("com.google.protobuf")
     }
-    api("com.google.protobuf:protobuf-java-util:3.21.7") {
+    api("com.google.protobuf:protobuf-java-util:3.25.4") {
         because("com.google.protobuf.util")
     }
     api("com.hedera.cryptography:hedera-cryptography-pairings-api:0.1.0-SNAPSHOT") {
@@ -122,9 +125,6 @@ dependencies.constraints {
     api("jakarta.inject:jakarta.inject-api:2.0.1") {
         because("jakarta.inject")
     }
-    api("javax.annotation:javax.annotation-api:1.3.2") {
-        because("java.annotation")
-    }
     api("javax.inject:javax.inject:1") {
         because("javax.inject")
     }
@@ -230,10 +230,7 @@ dependencies.constraints {
     api("uk.org.webcompere:system-stubs-jupiter:2.1.5") {
         because("uk.org.webcompere.systemstubs.jupiter")
     }
-}
 
-dependencies.constraints {
-    // required to merge 'javax.annotation-api' into 'com.google.code.findbugs:jsr305'
-    // to have all annotations on the classpath available at compile time
-    api("javax.annotation:javax.annotation-api:1.3.2")
+    api("com.google.protobuf:protoc:3.25.4")
+    api("io.grpc:protoc-gen-grpc-java:1.66.0")
 }
diff --git a/hedera-node/developers.properties b/hedera-node/developers.properties
new file mode 100644
index 000000000000..f1887ac9ac26
--- /dev/null
+++ b/hedera-node/developers.properties
@@ -0,0 +1,4 @@
+hedera-base@swirldslabs.com=Hedera Base Team
+hedera-services@swirldslabs.com=Hedera Services Team
+hedera-smart-contracts@swirldslabs.com=Hedera Smart Contracts Team
+release-engineering@swirldslabs.com=Release Engineering Team
diff --git a/hedera-node/docs/design/services/service-modules.md b/hedera-node/docs/design/services/service-modules.md
index bb7be5df64c7..e8230c7440ca 100644
--- a/hedera-node/docs/design/services/service-modules.md
+++ b/hedera-node/docs/design/services/service-modules.md
@@ -45,7 +45,7 @@ Next to this the `build.gradle.kts` file should look like this:
 
 ```
 plugins {
-    id("com.hedera.gradle.services")
+    id("com.hedera.gradle.module.java-library")
 }
 
 description = "Hedera Foo Service API"
@@ -130,7 +130,7 @@ Based on the given definitions and constrains a minimalistic `build.gradle.kts`
 
 ```
 plugins {
-    id("com.hedera.gradle.services")
+    id("com.hedera.gradle.module.java-library")
 }
 
 description = "Default Hedera Foo Service Implementation"
diff --git a/hedera-node/hapi-fees/build.gradle.kts b/hedera-node/hapi-fees/build.gradle.kts
index 05a8a548c047..43a366fb683f 100644
--- a/hedera-node/hapi-fees/build.gradle.kts
+++ b/hedera-node/hapi-fees/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Hedera Services API Fees"
 
diff --git a/hedera-node/hapi-utils/build.gradle.kts b/hedera-node/hapi-utils/build.gradle.kts
index 8efcebff1949..086d42e4fc8e 100644
--- a/hedera-node/hapi-utils/build.gradle.kts
+++ b/hedera-node/hapi-utils/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Hedera Services API Utilities"
 
diff --git a/hedera-node/hedera-addressbook-service-impl/build.gradle.kts b/hedera-node/hedera-addressbook-service-impl/build.gradle.kts
index f46f5d6533ff..2b3ca1fd99e8 100644
--- a/hedera-node/hedera-addressbook-service-impl/build.gradle.kts
+++ b/hedera-node/hedera-addressbook-service-impl/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Default Hedera AddressBook Service Implementation"
 
diff --git a/hedera-node/hedera-addressbook-service/build.gradle.kts b/hedera-node/hedera-addressbook-service/build.gradle.kts
index 2d0fd03761ac..98e8c53da5bb 100644
--- a/hedera-node/hedera-addressbook-service/build.gradle.kts
+++ b/hedera-node/hedera-addressbook-service/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Hedera AddressBook Service API"
 
diff --git a/hedera-node/hedera-app-spi/build.gradle.kts b/hedera-node/hedera-app-spi/build.gradle.kts
index 743eee16189d..70d30f9ae661 100644
--- a/hedera-node/hedera-app-spi/build.gradle.kts
+++ b/hedera-node/hedera-app-spi/build.gradle.kts
@@ -15,8 +15,7 @@
  */
 
 plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
+    id("com.hedera.gradle.module.java-library")
     id("com.hedera.gradle.feature.test-fixtures")
 }
 
diff --git a/hedera-node/hedera-app/build.gradle.kts b/hedera-node/hedera-app/build.gradle.kts
index e8ea30e9bf45..af91d52c40d8 100644
--- a/hedera-node/hedera-app/build.gradle.kts
+++ b/hedera-node/hedera-app/build.gradle.kts
@@ -15,8 +15,7 @@
  */
 
 plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
+    id("com.hedera.gradle.module.java-library")
     id("com.hedera.gradle.feature.benchmark")
     id("com.hedera.gradle.feature.test-fixtures")
 }
@@ -165,7 +164,10 @@ val cleanRun =
 
 tasks.clean { dependsOn(cleanRun) }
 
-tasks.register("showHapiVersion") { doLast { println(libs.versions.hapi.proto.get()) } }
+tasks.register("showHapiVersion") {
+    inputs.property("version", project.version)
+    doLast { println(inputs.properties["version"]) }
+}
 
 var updateDockerEnvTask =
     tasks.register<Exec>("updateDockerEnv") {
diff --git a/hedera-node/hedera-config/build.gradle.kts b/hedera-node/hedera-config/build.gradle.kts
index 7485155dc32f..87ca80bc8272 100644
--- a/hedera-node/hedera-config/build.gradle.kts
+++ b/hedera-node/hedera-config/build.gradle.kts
@@ -15,8 +15,7 @@
  */
 
 plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
+    id("com.hedera.gradle.module.java-library")
     id("com.hedera.gradle.feature.test-fixtures")
 }
 
diff --git a/hedera-node/hedera-consensus-service-impl/build.gradle.kts b/hedera-node/hedera-consensus-service-impl/build.gradle.kts
index 67f55402d6f2..5e2690b316df 100644
--- a/hedera-node/hedera-consensus-service-impl/build.gradle.kts
+++ b/hedera-node/hedera-consensus-service-impl/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Default Hedera Consensus Service Implementation"
 
diff --git a/hedera-node/hedera-consensus-service/build.gradle.kts b/hedera-node/hedera-consensus-service/build.gradle.kts
index 04a3aa43ffc0..703ec63ff99c 100644
--- a/hedera-node/hedera-consensus-service/build.gradle.kts
+++ b/hedera-node/hedera-consensus-service/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Hedera Consensus Service API"
 
diff --git a/hedera-node/hedera-file-service-impl/build.gradle.kts b/hedera-node/hedera-file-service-impl/build.gradle.kts
index 0eeaea14bdac..ce5a3fd8e59f 100644
--- a/hedera-node/hedera-file-service-impl/build.gradle.kts
+++ b/hedera-node/hedera-file-service-impl/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Default Hedera File Service Implementation"
 
diff --git a/hedera-node/hedera-file-service/build.gradle.kts b/hedera-node/hedera-file-service/build.gradle.kts
index 8a4a2c69c71a..24d5f9eadc05 100644
--- a/hedera-node/hedera-file-service/build.gradle.kts
+++ b/hedera-node/hedera-file-service/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Hedera File Service API"
 
diff --git a/hedera-node/hedera-network-admin-service-impl/build.gradle.kts b/hedera-node/hedera-network-admin-service-impl/build.gradle.kts
index ef0b562a944b..58b42aa4481b 100644
--- a/hedera-node/hedera-network-admin-service-impl/build.gradle.kts
+++ b/hedera-node/hedera-network-admin-service-impl/build.gradle.kts
@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Default Hedera Network Admin Service Implementation"
 
 val writeSemanticVersionProperties =
     tasks.register<WriteProperties>("writeSemanticVersionProperties") {
-        property("hapi.proto.version", libs.versions.hapi.proto.get())
+        property("hapi.proto.version", project.version)
         property("hedera.services.version", project.version)
 
         destinationFile.set(
diff --git a/hedera-node/hedera-network-admin-service/build.gradle.kts b/hedera-node/hedera-network-admin-service/build.gradle.kts
index e4844ed09c55..c168e745afda 100644
--- a/hedera-node/hedera-network-admin-service/build.gradle.kts
+++ b/hedera-node/hedera-network-admin-service/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Hedera NetworkAdmin Service API"
 
diff --git a/hedera-node/hedera-schedule-service-impl/build.gradle.kts b/hedera-node/hedera-schedule-service-impl/build.gradle.kts
index 149f263fe93f..770a74714a63 100644
--- a/hedera-node/hedera-schedule-service-impl/build.gradle.kts
+++ b/hedera-node/hedera-schedule-service-impl/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Default Hedera Schedule Service Implementation"
 
diff --git a/hedera-node/hedera-schedule-service/build.gradle.kts b/hedera-node/hedera-schedule-service/build.gradle.kts
index b187f3d2a100..7caae69c7cfc 100644
--- a/hedera-node/hedera-schedule-service/build.gradle.kts
+++ b/hedera-node/hedera-schedule-service/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Hedera Schedule Service API"
 
diff --git a/hedera-node/hedera-smart-contract-service-impl/build.gradle.kts b/hedera-node/hedera-smart-contract-service-impl/build.gradle.kts
index 694111ddf40e..8bf70508de96 100644
--- a/hedera-node/hedera-smart-contract-service-impl/build.gradle.kts
+++ b/hedera-node/hedera-smart-contract-service-impl/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Default Hedera Smart Contract Service Implementation"
 
diff --git a/hedera-node/hedera-smart-contract-service/build.gradle.kts b/hedera-node/hedera-smart-contract-service/build.gradle.kts
index d855b687dbf0..9fbc7dbc2f93 100644
--- a/hedera-node/hedera-smart-contract-service/build.gradle.kts
+++ b/hedera-node/hedera-smart-contract-service/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Hedera Smart Contract Service API"
 
diff --git a/hedera-node/hedera-token-service-impl/build.gradle.kts b/hedera-node/hedera-token-service-impl/build.gradle.kts
index 037f96c17053..7fe377f7e9ee 100644
--- a/hedera-node/hedera-token-service-impl/build.gradle.kts
+++ b/hedera-node/hedera-token-service-impl/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Default Hedera Token Service Implementation"
 
diff --git a/hedera-node/hedera-token-service/build.gradle.kts b/hedera-node/hedera-token-service/build.gradle.kts
index d6c299811c32..99ea631fa853 100644
--- a/hedera-node/hedera-token-service/build.gradle.kts
+++ b/hedera-node/hedera-token-service/build.gradle.kts
@@ -15,8 +15,7 @@
  */
 
 plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
+    id("com.hedera.gradle.module.java-library")
     id("com.hedera.gradle.feature.test-fixtures")
 }
 
diff --git a/hedera-node/hedera-util-service-impl/build.gradle.kts b/hedera-node/hedera-util-service-impl/build.gradle.kts
index e76f4f360ac1..2621b3e05e61 100644
--- a/hedera-node/hedera-util-service-impl/build.gradle.kts
+++ b/hedera-node/hedera-util-service-impl/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Default Hedera Util Service Implementation"
 
diff --git a/hedera-node/hedera-util-service/build.gradle.kts b/hedera-node/hedera-util-service/build.gradle.kts
index 3ce441d52601..6850cd39e1e1 100644
--- a/hedera-node/hedera-util-service/build.gradle.kts
+++ b/hedera-node/hedera-util-service/build.gradle.kts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.services-publish")
-}
+plugins { id("com.hedera.gradle.module.java-library") }
 
 description = "Hedera Util Service API"
 
diff --git a/hedera-node/test-clients/build.gradle.kts b/hedera-node/test-clients/build.gradle.kts
index 6b55cc983f60..1b6f3c189cb6 100644
--- a/hedera-node/test-clients/build.gradle.kts
+++ b/hedera-node/test-clients/build.gradle.kts
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
+import com.github.jengelman.gradle.plugins.shadow.internal.DefaultDependencyFilter
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-    id("com.hedera.gradle.services")
-    id("com.hedera.gradle.shadow-jar")
+    id("com.hedera.gradle.module.application")
+    id("com.gradleup.shadow") version "8.3.0"
 }
 
 description = "Hedera Services Test Clients for End to End Tests (EET)"
@@ -35,6 +36,8 @@ sourceSets {
     create("yahcli")
 }
 
+tasks.withType<JavaCompile>().configureEach { options.compilerArgs.add("-Xlint:-exports") }
+
 tasks.register<JavaExec>("runTestClient") {
     group = "build"
     description = "Run a test client via -PtestClient=<Class>"
@@ -230,17 +233,23 @@ tasks.register<Test>("testRepeatable") {
     modularity.inferModulePath.set(false)
 }
 
-tasks.shadowJar {
-    archiveFileName.set("SuiteRunner.jar")
+tasks.withType<ShadowJar>().configureEach {
+    group = "shadow"
+    from(sourceSets.main.get().output)
+    mergeServiceFiles()
 
-    manifest {
-        attributes(
-            "Main-Class" to "com.hedera.services.bdd.suites.SuiteRunner",
-            "Multi-Release" to "true"
-        )
-    }
+    manifest { attributes("Multi-Release" to "true") }
+
+    // There is an issue in the shadow plugin that it automatically accesses the
+    // files in 'runtimeClasspath' while Gradle is building the task graph.
+    // See: https://github.com/GradleUp/shadow/issues/882
+    dependencyFilter = NoResolveDependencyFilter()
 }
 
+application.mainClass = "com.hedera.services.bdd.suites.SuiteRunner"
+
+tasks.shadowJar { archiveFileName.set("SuiteRunner.jar") }
+
 val yahCliJar =
     tasks.register<ShadowJar>("yahCliJar") {
         exclude(listOf("META-INF/*.DSA", "META-INF/*.RSA", "META-INF/*.SF", "META-INF/INDEX.LIST"))
@@ -248,12 +257,7 @@ val yahCliJar =
         archiveClassifier.set("yahcli")
         configurations = listOf(project.configurations.getByName("yahcliRuntimeClasspath"))
 
-        manifest {
-            attributes(
-                "Main-Class" to "com.hedera.services.yahcli.Yahcli",
-                "Multi-Release" to "true"
-            )
-        }
+        manifest { attributes("Main-Class" to "com.hedera.services.yahcli.Yahcli") }
     }
 
 val rcdiffJar =
@@ -265,12 +269,7 @@ val rcdiffJar =
         archiveFileName.set("rcdiff.jar")
         configurations = listOf(project.configurations.getByName("rcdiffRuntimeClasspath"))
 
-        manifest {
-            attributes(
-                "Main-Class" to "com.hedera.services.rcdiff.RcDiffCmdWrapper",
-                "Multi-Release" to "true"
-            )
-        }
+        manifest { attributes("Main-Class" to "com.hedera.services.rcdiff.RcDiffCmdWrapper") }
     }
 
 val validationJar =
@@ -282,8 +281,7 @@ val validationJar =
         manifest {
             attributes(
                 "Main-Class" to
-                    "com.hedera.services.bdd.suites.utils.validation.ValidationScenarios",
-                "Multi-Release" to "true"
+                    "com.hedera.services.bdd.suites.utils.validation.ValidationScenarios"
             )
         }
     }
@@ -319,3 +317,9 @@ tasks.clean {
     dependsOn(cleanYahCli)
     dependsOn(cleanValidation)
 }
+
+class NoResolveDependencyFilter : DefaultDependencyFilter(project) {
+    override fun resolve(configuration: FileCollection): FileCollection {
+        return configuration
+    }
+}
diff --git a/hedera-node/test-clients/src/main/java/module-info.java b/hedera-node/test-clients/src/main/java/module-info.java
index 05891b73c380..d85fb689b16e 100644
--- a/hedera-node/test-clients/src/main/java/module-info.java
+++ b/hedera-node/test-clients/src/main/java/module-info.java
@@ -63,30 +63,8 @@
     exports com.hedera.services.bdd.junit.support.validators.block;
     exports com.hedera.services.bdd.utils;
 
-    requires transitive com.hedera.node.app.hapi.fees;
-    requires transitive com.hedera.node.app.hapi.utils;
-    requires transitive com.hedera.node.app.test.fixtures;
-    requires transitive com.hedera.node.app;
-    requires transitive com.hedera.node.config;
-    requires transitive com.hedera.node.hapi;
-    requires transitive com.swirlds.base;
-    requires transitive com.swirlds.common;
-    requires transitive com.swirlds.config.api;
-    requires transitive com.swirlds.metrics.api;
-    requires transitive com.swirlds.platform.core;
-    requires transitive com.swirlds.state.api;
-    requires transitive com.fasterxml.jackson.annotation;
-    requires transitive com.google.common;
-    requires transitive com.google.protobuf;
-    requires transitive headlong;
-    requires transitive io.grpc;
-    requires transitive net.i2p.crypto.eddsa;
-    requires transitive org.apache.commons.io;
-    requires transitive org.apache.logging.log4j;
-    requires transitive org.junit.jupiter.api;
-    requires transitive org.junit.platform.launcher;
-    requires transitive org.testcontainers;
-    requires transitive tuweni.bytes;
+    requires com.hedera.node.app.hapi.fees;
+    requires com.hedera.node.app.hapi.utils;
     requires com.hedera.node.app.service.addressbook.impl;
     requires com.hedera.node.app.service.addressbook;
     requires com.hedera.node.app.service.consensus.impl;
@@ -98,29 +76,51 @@
     requires com.hedera.node.app.service.token;
     requires com.hedera.node.app.service.util.impl;
     requires com.hedera.node.app.spi;
+    requires com.hedera.node.app.test.fixtures;
+    requires com.hedera.node.app;
+    requires com.hedera.node.config;
+    requires com.hedera.node.hapi;
     requires com.swirlds.base.test.fixtures;
+    requires com.swirlds.base;
+    requires com.swirlds.common;
+    requires com.swirlds.config.api;
     requires com.swirlds.config.extensions.test.fixtures;
+    requires com.swirlds.metrics.api;
     requires com.swirlds.platform.core.test.fixtures;
+    requires com.swirlds.platform.core;
+    requires com.swirlds.state.api;
+    requires com.fasterxml.jackson.annotation;
     requires com.fasterxml.jackson.core;
     requires com.fasterxml.jackson.databind;
     requires com.github.docker.java.api;
+    requires com.google.common;
+    requires com.google.protobuf;
     requires com.sun.jna;
+    requires headlong;
     requires io.grpc.netty;
     requires io.grpc.stub;
+    requires io.grpc;
     requires io.netty.handler;
     requires java.desktop;
     requires java.net.http;
+    requires net.i2p.crypto.eddsa;
+    requires org.apache.commons.io;
     requires org.apache.commons.lang3;
     requires org.apache.logging.log4j.core;
+    requires org.apache.logging.log4j;
     requires org.assertj.core;
     requires org.bouncycastle.provider;
     requires org.hyperledger.besu.datatypes;
     requires org.hyperledger.besu.internal.crypto;
     requires org.hyperledger.besu.nativelib.secp256k1;
     requires org.json;
+    requires org.junit.jupiter.api;
     requires org.junit.platform.commons;
+    requires org.junit.platform.launcher;
     requires org.opentest4j;
+    requires org.testcontainers;
     requires org.yaml.snakeyaml;
+    requires tuweni.bytes;
     requires tuweni.units;
     requires static com.github.spotbugs.annotations;
     requires static com.hedera.pbj.runtime;
diff --git a/hedera-node/test-clients/src/yahcli/java/module-info.java b/hedera-node/test-clients/src/yahcli/java/module-info.java
index c0e5cc0e5bd3..be9118c3c2ad 100644
--- a/hedera-node/test-clients/src/yahcli/java/module-info.java
+++ b/hedera-node/test-clients/src/yahcli/java/module-info.java
@@ -7,6 +7,7 @@
     requires com.swirlds.common;
     requires com.github.spotbugs.annotations;
     requires com.google.common;
+    requires com.google.protobuf;
     requires info.picocli;
     requires net.i2p.crypto.eddsa;
     requires org.apache.logging.log4j;
diff --git a/platform-sdk/build.gradle.kts b/platform-sdk/build.gradle.kts
index c88872a30022..14f93611daaa 100644
--- a/platform-sdk/build.gradle.kts
+++ b/platform-sdk/build.gradle.kts
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.java") }
+plugins { id("com.hedera.gradle.module.application") }
 
 val sdkDir = layout.projectDirectory.dir("sdk")
 
-tasks.register<JavaExec>("run") {
-    group = "application"
+tasks.named<JavaExec>("run") {
     workingDir = sdkDir.asFile
-    mainClass.set("com.swirlds.platform.Browser")
+    mainClass = "com.swirlds.platform.Browser"
     classpath = sdkDir.asFileTree.matching { include("*.jar") }
     jvmArgs = listOf("-agentlib:jdwp=transport=dt_socket,address=8888,server=y,suspend=n")
     maxHeapSize = "8g"
diff --git a/platform-sdk/description.txt b/platform-sdk/description.txt
new file mode 100644
index 000000000000..90ec8bd24256
--- /dev/null
+++ b/platform-sdk/description.txt
@@ -0,0 +1,3 @@
+Swirlds is a software platform designed to build fully-distributed applications that harness the power of the cloud
+without servers. Now you can develop applications with fairness in decision making, speed, trust and reliability, at
+a fraction of the cost of traditional server-based platforms.
diff --git a/platform-sdk/developers.properties b/platform-sdk/developers.properties
new file mode 100644
index 000000000000..8acd5e1ea94e
--- /dev/null
+++ b/platform-sdk/developers.properties
@@ -0,0 +1,4 @@
+platform-base@swirldslabs.com=Platform Base Team
+platform-hashgraph@swirldslabs.com=Platform Hashgraph Team
+platform-data@swirldslabs.com=Platform Data Team
+release-engineering@swirldslabs.com=Release Engineering Team
diff --git a/platform-sdk/platform-apps/demos/CryptocurrencyDemo/build.gradle.kts b/platform-sdk/platform-apps/demos/CryptocurrencyDemo/build.gradle.kts
index 96c6c136e38b..20e969e5c585 100644
--- a/platform-sdk/platform-apps/demos/CryptocurrencyDemo/build.gradle.kts
+++ b/platform-sdk/platform-apps/demos/CryptocurrencyDemo/build.gradle.kts
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.application") }
+plugins {
+    id("com.hedera.gradle.module.application")
+    id("com.hedera.services.gradle.feature.copy-to-sdk")
+}
 
-application.mainClass.set("com.swirlds.demo.crypto.CryptocurrencyDemoMain")
+application.mainClass = "com.swirlds.demo.crypto.CryptocurrencyDemoMain"
diff --git a/platform-sdk/platform-apps/demos/HelloSwirldDemo/build.gradle.kts b/platform-sdk/platform-apps/demos/HelloSwirldDemo/build.gradle.kts
index 076aa930d40c..0dfdd7b83bdf 100644
--- a/platform-sdk/platform-apps/demos/HelloSwirldDemo/build.gradle.kts
+++ b/platform-sdk/platform-apps/demos/HelloSwirldDemo/build.gradle.kts
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.application") }
+plugins {
+    id("com.hedera.gradle.module.application")
+    id("com.hedera.services.gradle.feature.copy-to-sdk")
+}
 
-application.mainClass.set("com.swirlds.demo.hello.HelloSwirldDemoMain")
+application.mainClass = "com.swirlds.demo.hello.HelloSwirldDemoMain"
diff --git a/platform-sdk/platform-apps/demos/StatsDemo/build.gradle.kts b/platform-sdk/platform-apps/demos/StatsDemo/build.gradle.kts
index 2a6bd33eb2c3..00e1f59ac92f 100644
--- a/platform-sdk/platform-apps/demos/StatsDemo/build.gradle.kts
+++ b/platform-sdk/platform-apps/demos/StatsDemo/build.gradle.kts
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.application") }
+plugins {
+    id("com.hedera.gradle.module.application")
+    id("com.hedera.services.gradle.feature.copy-to-sdk")
+}
 
-application.mainClass.set("com.swirlds.demo.stats.StatsDemoMain")
+application.mainClass = "com.swirlds.demo.stats.StatsDemoMain"
diff --git a/platform-sdk/platform-apps/tests/AddressBookTestingTool/build.gradle.kts b/platform-sdk/platform-apps/tests/AddressBookTestingTool/build.gradle.kts
index 6bb16a68e867..a77894fc7aff 100644
--- a/platform-sdk/platform-apps/tests/AddressBookTestingTool/build.gradle.kts
+++ b/platform-sdk/platform-apps/tests/AddressBookTestingTool/build.gradle.kts
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.application") }
+plugins {
+    id("com.hedera.gradle.module.application")
+    id("com.hedera.services.gradle.feature.copy-to-sdk")
+}
 
-application.mainClass.set("com.swirlds.demo.addressbook.AddressBookTestingToolMain")
+application.mainClass = "com.swirlds.demo.addressbook.AddressBookTestingToolMain"
diff --git a/platform-sdk/platform-apps/tests/ConsistencyTestingTool/build.gradle.kts b/platform-sdk/platform-apps/tests/ConsistencyTestingTool/build.gradle.kts
index 75324db7df15..5500a7d80f33 100644
--- a/platform-sdk/platform-apps/tests/ConsistencyTestingTool/build.gradle.kts
+++ b/platform-sdk/platform-apps/tests/ConsistencyTestingTool/build.gradle.kts
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.application") }
+plugins {
+    id("com.hedera.gradle.module.application")
+    id("com.hedera.services.gradle.feature.copy-to-sdk")
+}
 
-application.mainClass.set("com.swirlds.demo.consistency.ConsistencyTestingToolMain")
+application.mainClass = "com.swirlds.demo.consistency.ConsistencyTestingToolMain"
 
 mainModuleInfo { annotationProcessor("com.swirlds.config.processor") }
 
diff --git a/platform-sdk/platform-apps/tests/ISSTestingTool/build.gradle.kts b/platform-sdk/platform-apps/tests/ISSTestingTool/build.gradle.kts
index 0ccf911efacb..3e418b74284e 100644
--- a/platform-sdk/platform-apps/tests/ISSTestingTool/build.gradle.kts
+++ b/platform-sdk/platform-apps/tests/ISSTestingTool/build.gradle.kts
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.application") }
+plugins {
+    id("com.hedera.gradle.module.application")
+    id("com.hedera.services.gradle.feature.copy-to-sdk")
+}
 
-application.mainClass.set("com.swirlds.demo.iss.ISSTestingToolMain")
+application.mainClass = "com.swirlds.demo.iss.ISSTestingToolMain"
 
 mainModuleInfo { annotationProcessor("com.swirlds.config.processor") }
diff --git a/platform-sdk/platform-apps/tests/MigrationTestingTool/build.gradle.kts b/platform-sdk/platform-apps/tests/MigrationTestingTool/build.gradle.kts
index faf0295e6b51..ac7442441974 100644
--- a/platform-sdk/platform-apps/tests/MigrationTestingTool/build.gradle.kts
+++ b/platform-sdk/platform-apps/tests/MigrationTestingTool/build.gradle.kts
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.application") }
+plugins {
+    id("com.hedera.gradle.module.application")
+    id("com.hedera.services.gradle.feature.copy-to-sdk")
+}
 
-application.mainClass.set("com.swirlds.demo.migration.MigrationTestingToolMain")
+application.mainClass = "com.swirlds.demo.migration.MigrationTestingToolMain"
 
 testModuleInfo {
     requires("org.junit.jupiter.api")
diff --git a/platform-sdk/platform-apps/tests/PlatformTestingTool/build.gradle.kts b/platform-sdk/platform-apps/tests/PlatformTestingTool/build.gradle.kts
index 76903afdb2b0..4a73cdf538ea 100644
--- a/platform-sdk/platform-apps/tests/PlatformTestingTool/build.gradle.kts
+++ b/platform-sdk/platform-apps/tests/PlatformTestingTool/build.gradle.kts
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-import com.google.protobuf.gradle.ProtobufExtract
-
 plugins {
-    id("com.hedera.gradle.application")
+    id("com.hedera.gradle.module.application")
     id("com.hedera.gradle.feature.test-timing-sensitive")
+    id("com.hedera.services.gradle.feature.copy-to-sdk")
     id("com.google.protobuf")
 }
 
@@ -28,7 +27,7 @@ tasks.withType<JavaCompile>().configureEach {
     options.compilerArgs.add("-Xlint:-exports,-static,-cast")
 }
 
-application.mainClass.set("com.swirlds.demo.platform.PlatformTestingToolMain")
+application.mainClass = "com.swirlds.demo.platform.PlatformTestingToolMain"
 
 testModuleInfo {
     requires("org.apache.logging.log4j.core")
@@ -51,17 +50,15 @@ timingSensitiveModuleInfo {
     requires("org.mockito")
 }
 
-protobuf { protoc { artifact = "com.google.protobuf:protoc:3.21.5" } }
-
-configurations {
-    // Give proto compile access to the dependency versions
-    compileProtoPath { extendsFrom(configurations.internal.get()) }
-    testCompileProtoPath { extendsFrom(configurations.internal.get()) }
-    timingSensitiveCompileProtoPath { extendsFrom(configurations.internal.get()) }
-}
+protobuf { protoc { artifact = "com.google.protobuf:protoc" } }
 
-tasks.withType<ProtobufExtract>().configureEach {
-    if (name == "extractIncludeProto") {
-        enabled = false
+configurations.configureEach {
+    if (name.startsWith("protobufToolsLocator") || name.endsWith("ProtoPath")) {
+        attributes { attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_API)) }
+        exclude(group = project.group.toString(), module = project.name)
+        withDependencies {
+            isTransitive = true
+            extendsFrom(configurations["internal"])
+        }
     }
 }
diff --git a/platform-sdk/platform-apps/tests/StatsSigningTestingTool/build.gradle.kts b/platform-sdk/platform-apps/tests/StatsSigningTestingTool/build.gradle.kts
index 110a05eb2d7a..812450e83e3f 100644
--- a/platform-sdk/platform-apps/tests/StatsSigningTestingTool/build.gradle.kts
+++ b/platform-sdk/platform-apps/tests/StatsSigningTestingTool/build.gradle.kts
@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.application") }
+plugins {
+    id("com.hedera.gradle.module.application")
+    id("com.hedera.services.gradle.feature.copy-to-sdk")
+}
 
 // Remove the following line to enable all 'javac' lint checks that we have turned on by default
 // and then fix the reported issues.
 tasks.withType<JavaCompile>().configureEach { options.compilerArgs.add("-Xlint:-cast") }
 
-application.mainClass.set("com.swirlds.demo.stats.signing.StatsSigningTestingToolMain")
+application.mainClass = "com.swirlds.demo.stats.signing.StatsSigningTestingToolMain"
diff --git a/platform-sdk/platform-apps/tests/StressTestingTool/build.gradle.kts b/platform-sdk/platform-apps/tests/StressTestingTool/build.gradle.kts
index 780a202ff27d..e71fb0bb1abd 100644
--- a/platform-sdk/platform-apps/tests/StressTestingTool/build.gradle.kts
+++ b/platform-sdk/platform-apps/tests/StressTestingTool/build.gradle.kts
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.application") }
+plugins {
+    id("com.hedera.gradle.module.application")
+    id("com.hedera.services.gradle.feature.copy-to-sdk")
+}
 
-application.mainClass.set("com.swirlds.demo.stress.StressTestingToolMain")
+application.mainClass = "com.swirlds.demo.stress.StressTestingToolMain"
 
 mainModuleInfo { annotationProcessor("com.swirlds.config.processor") }
diff --git a/platform-sdk/swirlds-base/build.gradle.kts b/platform-sdk/swirlds-base/build.gradle.kts
index 91078842e575..fbdb2a29412c 100644
--- a/platform-sdk/swirlds-base/build.gradle.kts
+++ b/platform-sdk/swirlds-base/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
     id("com.hedera.gradle.feature.benchmark")
     id("com.hedera.gradle.feature.test-fixtures")
     id("com.hedera.gradle.feature.test-timing-sensitive")
diff --git a/platform-sdk/swirlds-benchmarks/build.gradle.kts b/platform-sdk/swirlds-benchmarks/build.gradle.kts
index 28429d4ebed1..95da3fbbac5e 100644
--- a/platform-sdk/swirlds-benchmarks/build.gradle.kts
+++ b/platform-sdk/swirlds-benchmarks/build.gradle.kts
@@ -17,7 +17,7 @@
 import me.champeau.jmh.JMHTask
 
 plugins {
-    id("com.hedera.gradle.platform")
+    id("com.hedera.gradle.module.application")
     id("com.hedera.gradle.feature.benchmark")
 }
 
diff --git a/platform-sdk/swirlds-cli/build.gradle.kts b/platform-sdk/swirlds-cli/build.gradle.kts
index 6daacca0a6da..dccf8bf46918 100644
--- a/platform-sdk/swirlds-cli/build.gradle.kts
+++ b/platform-sdk/swirlds-cli/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
 }
 
 testModuleInfo { requires("org.junit.jupiter.api") }
diff --git a/platform-sdk/swirlds-common/build.gradle.kts b/platform-sdk/swirlds-common/build.gradle.kts
index 7a3984f114ef..a3a3ecebc9c7 100644
--- a/platform-sdk/swirlds-common/build.gradle.kts
+++ b/platform-sdk/swirlds-common/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
     id("com.hedera.gradle.feature.test-fixtures")
     id("com.hedera.gradle.feature.test-timing-sensitive")
 }
diff --git a/platform-sdk/swirlds-config-api/build.gradle.kts b/platform-sdk/swirlds-config-api/build.gradle.kts
index 673cff9e1397..33288c6bf3b0 100644
--- a/platform-sdk/swirlds-config-api/build.gradle.kts
+++ b/platform-sdk/swirlds-config-api/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
     id("com.hedera.gradle.feature.test-fixtures")
 }
diff --git a/platform-sdk/swirlds-config-extensions/build.gradle.kts b/platform-sdk/swirlds-config-extensions/build.gradle.kts
index f11a3d013c15..f2d22eea2799 100644
--- a/platform-sdk/swirlds-config-extensions/build.gradle.kts
+++ b/platform-sdk/swirlds-config-extensions/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
     id("com.hedera.gradle.feature.test-fixtures")
 }
 
diff --git a/platform-sdk/swirlds-config-impl/build.gradle.kts b/platform-sdk/swirlds-config-impl/build.gradle.kts
index f296d4524572..87d98b7df6cf 100644
--- a/platform-sdk/swirlds-config-impl/build.gradle.kts
+++ b/platform-sdk/swirlds-config-impl/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
     id("com.hedera.gradle.feature.benchmark")
 }
 
diff --git a/platform-sdk/swirlds-config-processor/build.gradle.kts b/platform-sdk/swirlds-config-processor/build.gradle.kts
index 19b3d4822b37..d0de20ffa752 100644
--- a/platform-sdk/swirlds-config-processor/build.gradle.kts
+++ b/platform-sdk/swirlds-config-processor/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
 }
 
 mainModuleInfo { annotationProcessor("com.google.auto.service.processor") }
diff --git a/platform-sdk/swirlds-fchashmap/build.gradle.kts b/platform-sdk/swirlds-fchashmap/build.gradle.kts
index 2ea867132dcc..8b129ed60c59 100644
--- a/platform-sdk/swirlds-fchashmap/build.gradle.kts
+++ b/platform-sdk/swirlds-fchashmap/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
 }
 
 mainModuleInfo { annotationProcessor("com.swirlds.config.processor") }
diff --git a/platform-sdk/swirlds-fcqueue/build.gradle.kts b/platform-sdk/swirlds-fcqueue/build.gradle.kts
index e1675a00ef13..ee048a352570 100644
--- a/platform-sdk/swirlds-fcqueue/build.gradle.kts
+++ b/platform-sdk/swirlds-fcqueue/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
 }
 
 testModuleInfo {
diff --git a/platform-sdk/swirlds-logging-log4j-appender/build.gradle.kts b/platform-sdk/swirlds-logging-log4j-appender/build.gradle.kts
index 6c7b688ba995..db50f6f62171 100644
--- a/platform-sdk/swirlds-logging-log4j-appender/build.gradle.kts
+++ b/platform-sdk/swirlds-logging-log4j-appender/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
 }
 
 mainModuleInfo {
diff --git a/platform-sdk/swirlds-logging/build.gradle.kts b/platform-sdk/swirlds-logging/build.gradle.kts
index fdaa4647d989..13f9a3938195 100644
--- a/platform-sdk/swirlds-logging/build.gradle.kts
+++ b/platform-sdk/swirlds-logging/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
     id("com.hedera.gradle.feature.benchmark")
     id("com.hedera.gradle.feature.test-fixtures")
     id("com.hedera.gradle.feature.test-time-consuming")
diff --git a/platform-sdk/swirlds-merkle/build.gradle.kts b/platform-sdk/swirlds-merkle/build.gradle.kts
index 5db6bc803b11..557b527d55f5 100644
--- a/platform-sdk/swirlds-merkle/build.gradle.kts
+++ b/platform-sdk/swirlds-merkle/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
     id("com.hedera.gradle.feature.test-fixtures")
     id("com.hedera.gradle.feature.test-timing-sensitive")
 }
diff --git a/platform-sdk/swirlds-merkledb/build.gradle.kts b/platform-sdk/swirlds-merkledb/build.gradle.kts
index a17fc9fa72ee..a83d08263b7d 100644
--- a/platform-sdk/swirlds-merkledb/build.gradle.kts
+++ b/platform-sdk/swirlds-merkledb/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
     id("com.hedera.gradle.feature.benchmark")
     id("com.hedera.gradle.feature.test-fixtures")
     id("com.hedera.gradle.feature.test-hammer")
diff --git a/platform-sdk/swirlds-metrics-api/build.gradle.kts b/platform-sdk/swirlds-metrics-api/build.gradle.kts
index 278ebab31a3a..338a4751264e 100644
--- a/platform-sdk/swirlds-metrics-api/build.gradle.kts
+++ b/platform-sdk/swirlds-metrics-api/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
 }
 
 testModuleInfo {
diff --git a/platform-sdk/swirlds-metrics-impl/build.gradle.kts b/platform-sdk/swirlds-metrics-impl/build.gradle.kts
index 278ebab31a3a..338a4751264e 100644
--- a/platform-sdk/swirlds-metrics-impl/build.gradle.kts
+++ b/platform-sdk/swirlds-metrics-impl/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
 }
 
 testModuleInfo {
diff --git a/platform-sdk/swirlds-platform-core/build.gradle.kts b/platform-sdk/swirlds-platform-core/build.gradle.kts
index 0d9d9c8528ad..07f3ca996675 100644
--- a/platform-sdk/swirlds-platform-core/build.gradle.kts
+++ b/platform-sdk/swirlds-platform-core/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
     id("com.hedera.gradle.feature.benchmark")
     id("com.hedera.gradle.feature.test-fixtures")
     id("com.hedera.gradle.feature.test-timing-sensitive")
diff --git a/platform-sdk/swirlds-state-api/build.gradle.kts b/platform-sdk/swirlds-state-api/build.gradle.kts
index 3a3e781966ee..5271a66307a2 100644
--- a/platform-sdk/swirlds-state-api/build.gradle.kts
+++ b/platform-sdk/swirlds-state-api/build.gradle.kts
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
     id("com.hedera.gradle.feature.test-fixtures")
 }
 
diff --git a/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/build.gradle.kts b/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/build.gradle.kts
index 6df6656b684e..cd4bd2bfbc73 100644
--- a/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/build.gradle.kts
+++ b/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/build.gradle.kts
@@ -15,8 +15,21 @@
  */
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.feature.benchmark")
+    id("java-library")
+    id("jacoco")
+    id("com.hedera.gradle.base.jpms-modules")
+    id("com.hedera.gradle.base.lifecycle")
+    id("com.hedera.gradle.base.version")
+    id("com.hedera.gradle.check.dependencies")
+    id("com.hedera.gradle.check.spotless")
+    id("com.hedera.gradle.check.spotless-java")
+    id("com.hedera.gradle.check.spotless-kotlin")
+    id("com.hedera.gradle.feature.git-properties-file")
+    id("com.hedera.gradle.feature.java-compile")
+    id("com.hedera.gradle.feature.java-doc")
+    id("com.hedera.gradle.feature.java-execute")
+    id("com.hedera.gradle.feature.test")
+    id("com.hedera.gradle.report.test-logger")
 }
 
 // Remove the following line to enable all 'javac' lint checks that we have turned on by default
diff --git a/platform-sdk/swirlds-virtualmap/build.gradle.kts b/platform-sdk/swirlds-virtualmap/build.gradle.kts
index f905ad12214b..46fc91882faa 100644
--- a/platform-sdk/swirlds-virtualmap/build.gradle.kts
+++ b/platform-sdk/swirlds-virtualmap/build.gradle.kts
@@ -17,8 +17,8 @@
 import me.champeau.jmh.JMHTask
 
 plugins {
-    id("com.hedera.gradle.platform")
-    id("com.hedera.gradle.platform-publish")
+    id("com.hedera.gradle.module.java-library")
+    id("com.hedera.gradle.feature.publish-artifactregistry")
     id("com.hedera.gradle.feature.benchmark")
     id("com.hedera.gradle.feature.test-fixtures")
     id("com.hedera.gradle.feature.test-hammer")
diff --git a/platform-sdk/swirlds/build.gradle.kts b/platform-sdk/swirlds/build.gradle.kts
index f2726a41736f..e382fe240c05 100644
--- a/platform-sdk/swirlds/build.gradle.kts
+++ b/platform-sdk/swirlds/build.gradle.kts
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-plugins { id("com.hedera.gradle.application") }
+plugins {
+    id("com.hedera.gradle.module.application")
+    id("com.hedera.services.gradle.feature.copy-to-sdk")
+}
 
 mainModuleInfo {
     runtimeOnly("com.swirlds.platform.core")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f20ab2b191e3..2a5c5330c85d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-pluginManagement { includeBuild("gradle/plugins") }
-
-plugins { id("com.hedera.gradle.settings") }
+pluginManagement {
+    // Remove this include (and the folder) once the plugins are published
+    includeBuild("gradle/hedera-gradle-conventions")
+    includeBuild("gradle/plugins")
+}
 
+plugins { id("com.hedera.gradle.build") version "1.0.0" }
 
 javaModules {
-    // Project to aggregate code coverage data for the whole repository into one report´
-    module("gradle/reports")
-
     // This "intermediate parent project" should be removed
     module("platform-sdk") { artifact = "swirlds-platform" }
 
@@ -86,21 +86,4 @@ javaModules {
     directory("platform-sdk/platform-apps/tests") {
         group = "com.swirlds"
     }
-
-    // "BOM" with versions of 3rd party dependencies
-    versions("hedera-dependency-versions")
-}
-
-// The HAPI API version to use for Protobuf sources.
-val hapiProtoVersion = "0.54.0"
-
-dependencyResolutionManagement {
-    // Protobuf tool versions
-    versionCatalogs.create("libs") {
-        version("google-proto", "3.19.4")
-        version("grpc-proto", "1.45.1")
-        version("hapi-proto", hapiProtoVersion)
-
-        plugin("pbj", "com.hedera.pbj.pbj-compiler").version("0.9.2")
-    }
 }