diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 02ab1ee8..8535b3ab 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -24,7 +24,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🔨 Run Build"
         id: build
         env:
@@ -48,14 +48,14 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "📤 Publish Snapshot to repo.grails.org"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
           GRADLE_PUBLISH_RELEASE: 'false'
-          MAVEN_PUBLISH_USERNAME: ${{ secrets.MAVEN_PUBLISH_USERNAME }}
-          MAVEN_PUBLISH_PASSWORD: ${{ secrets.MAVEN_PUBLISH_PASSWORD }}
-          MAVEN_PUBLISH_URL: ${{ secrets.MAVEN_PUBLISH_SNAPSHOT_URL }}
+          MAVEN_PUBLISH_URL: ${{ secrets.GRAILS_NEXUS_PUBLISH_SNAPSHOT_URL }}
+          MAVEN_PUBLISH_USERNAME: ${{ secrets.NEXUS_USER }}
+          MAVEN_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PW  }}
         run: ./gradlew publish
   docs:
     if: github.event_name == 'workflow_dispatch' || github.event_name == 'push'
@@ -75,7 +75,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🔨 Build Docs"
         id: docs
         env:
@@ -83,7 +83,7 @@ jobs:
         run: ./gradlew docs:docs --refresh-dependencies
       - name: "🚀 Publish to Github Pages"
         if: steps.docs.outcome == 'success'
-        uses: grails/grails-github-actions/deploy-github-pages@main
+        uses: apache/grails-github-actions/deploy-github-pages@asf
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GRADLE_PUBLISH_RELEASE: 'false'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3ad37a9b..b49e6232 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "⚙ Run pre-release"
         uses: grails/github-actions/pre-release@main
       - name: "🧩 Run Assemble"
@@ -76,7 +76,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🚀 Release Sonatype Staging Repository"
         env:
           NEXUS_PUBLISH_USERNAME: ${{ secrets.NEXUS_PUBLISH_USERNAME }}
@@ -113,7 +113,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "📖 Generate documentation"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.gradle b/build.gradle
index 8b3042e2..4817775b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
 buildscript {
     repositories {
         maven { url "https://repo.grails.org/grails/core" }
+        maven { url = 'https://repository.apache.org/content/repositories/snapshots' }
         if (System.getenv("GITHUB_MAVEN_PASSWORD") && !grailsVersion.endsWith('-SNAPSHOT')) {
             System.out.println("Adding Grails Core Repo")
             maven {
@@ -13,7 +14,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath platform("org.grails:grails-bom:$grailsVersion")
+        classpath platform("org.apache.grails:grails-bom:$grailsVersion")
         classpath "org.grails:grails-gradle-plugin"
     }
 }
@@ -22,6 +23,7 @@ allprojects {
     repositories {
         mavenCentral()
         maven { url "https://repo.grails.org/grails/core" }
+        maven { url = 'https://repository.apache.org/content/repositories/snapshots' }
         if (System.getenv("GITHUB_MAVEN_PASSWORD") && !grailsVersion.endsWith('-SNAPSHOT')) {
             System.out.println("Adding Grails Core Repo")
             maven {
@@ -35,18 +37,18 @@ allprojects {
     }
 }
 
-group = "org.grails.plugins"
+group = "org.apache.grails"
 version = project.projectVersion
 
 subprojects {
     if(project.name == 'plugin') {
         version = projectVersion
-        group = "org.grails.plugins"
+        group = "org.apache.grails"
 
         apply plugin:"org.grails.grails-publish"
         grailsPublish {
             artifactId = 'cache'
-            githubSlug = "grails/grails-cache"
+            githubSlug = "apache/grails-cache"
             license {
                 name = 'Apache-2.0'
             }
diff --git a/docs/build.gradle b/docs/build.gradle
index b698aabd..ac194932 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -3,6 +3,7 @@ import grails.doc.gradle.PublishGuide
 buildscript {
     repositories {
         maven { url = 'https://repo.grails.org/grails/core' }
+        maven { url = 'https://repository.apache.org/content/repositories/snapshots' }
         if (System.getenv("GITHUB_MAVEN_PASSWORD") && !grailsVersion.endsWith('-SNAPSHOT')) {
             System.out.println("Adding Grails Core Repo")
             maven {
@@ -15,14 +16,14 @@ buildscript {
         }
     }
     dependencies {
-        classpath "org.grails:grails-docs:$grailsVersion"
+        classpath "org.apache.grails:grails-docs-core:$grailsVersion"
     }
 }
 
 apply plugin: 'groovy'
 
 dependencies {
-    implementation platform("org.grails:grails-bom:$grailsVersion")
+    implementation platform("org.apache.grails:grails-bom:$grailsVersion")
     implementation 'org.apache.groovy:groovy-groovydoc'
     implementation 'org.apache.groovy:groovy-ant'
     implementation 'org.springframework:spring-core'
diff --git a/example/build.gradle b/example/build.gradle
index fab38192..6cb96ab0 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -13,8 +13,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath platform("org.grails:grails-bom:$grailsVersion")
-        classpath 'org.grails:grails-gradle-plugin'
+        classpath platform("org.apache.grails:grails-bom:$grailsVersion")
+        classpath 'org.apache.grails:grails-gradle-plugins'
     }
 }
 
@@ -28,26 +28,26 @@ plugins {
 version = projectVersion
 group = "com.demo"
 
-apply plugin: "org.grails.grails-web"
-apply plugin: "org.grails.grails-gsp"
+apply plugin: "org.apache.grails.gradle.grails-web"
+apply plugin: "org.apache.grails.gradle.grails-gsp"
 
 compileJava.options.release = 17
 
 dependencies {
-    implementation platform("org.grails:grails-bom:$grailsVersion")
+    implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
     implementation project(':plugin')
 
-    implementation "org.grails:grails-core"
-    implementation "org.grails:grails-logging"
-    implementation "org.grails:grails-plugin-databinding"
-    implementation "org.grails:grails-plugin-i18n"
-    implementation "org.grails:grails-plugin-interceptors"
-    implementation "org.grails:grails-plugin-rest"
-    implementation "org.grails:grails-plugin-services"
-    implementation "org.grails:grails-plugin-url-mappings"
-    implementation "org.grails:grails-web-boot"
-    implementation "org.grails.plugins:gsp"
+    implementation "org.apache.grails:grails-core"
+    implementation "org.apache.grails:grails-logging"
+    implementation "org.apache.grails:grails-databinding"
+    implementation "org.apache.grails:grails-i18n"
+    implementation "org.apache.grails:grails-interceptors"
+    implementation "org.apache.grails:grails-rest-transforms"
+    implementation "org.apache.grails:grails-services"
+    implementation "org.apache.grails:grails-url-mappings"
+    implementation "org.apache.grails.web:grails-web-boot"
+    implementation "org.apache.grails:grails-gsp"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
     implementation "org.springframework.boot:spring-boot-starter"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
@@ -55,17 +55,17 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "org.springframework.boot:spring-boot-starter-validation"
 
-    console "org.grails:grails-console"
+    console "org.apache.grails:grails-console"
 
     runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails"
     runtimeOnly "com.h2database:h2"
     runtimeOnly "org.apache.tomcat:tomcat-jdbc"
     runtimeOnly "org.fusesource.jansi:jansi"
 
-    integrationTestImplementation testFixtures("org.grails.plugins:geb")
+    integrationTestImplementation testFixtures("org.apache.grails:grails-geb")
 
-    testImplementation "org.grails:grails-gorm-testing-support"
-    testImplementation "org.grails:grails-web-testing-support"
+    testImplementation "org.apache.grails:grails-testing-support-datamapping"
+    testImplementation "org.apache.grails:grails-testing-support-web"
     testImplementation "org.spockframework:spock-core"
 }
 
diff --git a/plugin/build.gradle b/plugin/build.gradle
index c27ee676..23e5469e 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -1,6 +1,7 @@
 buildscript {
     repositories {
         maven { url = 'https://repo.grails.org/grails/core' }
+        maven { url = 'https://repository.apache.org/content/repositories/snapshots' }
         if (System.getenv("GITHUB_MAVEN_PASSWORD") && !grailsVersion.endsWith('-SNAPSHOT')) {
             System.out.println("Adding Grails Core Repo")
             maven {
@@ -13,36 +14,36 @@ buildscript {
         }
     }
     dependencies {
-        classpath platform("org.grails:grails-bom:$grailsVersion")
-        classpath 'org.grails:grails-gradle-plugin'
+        classpath platform("org.apache.grails:grails-bom:$grailsVersion")
+        classpath 'org.apache.grails:grails-gradle-plugins'
     }
 }
 
 version = projectVersion
-group = "org.grails.plugins"
+group = "org.apache.grails"
 
 apply plugin: 'groovy'
 apply plugin: 'java-library'
 
-apply plugin: 'org.grails.grails-plugin'
+apply plugin: 'org.apache.grails.gradle.grails-plugin'
 
 dependencies {
-    implementation platform("org.grails:grails-bom:$grailsVersion")
+    implementation platform("org.apache.grails:grails-bom:$grailsVersion")
 
-    api "org.grails:grails-core"
-    api "org.grails:grails-web-boot"
-    api "org.grails:grails-plugin-services"
+    api "org.apache.grails:grails-core"
+    api "org.apache.grails.web:grails-web-boot"
+    api "org.apache.grails:grails-services"
 
-    api "org.grails.plugins:gsp"
+    api "org.apache.grails:grails-gsp"
     api "org.codehaus.gpars:gpars:$gparsVersion"
     api "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentlinkedhashmapLruVersion"
 
-    compileOnly "org.grails:grails-plugin-domain-class"
+    compileOnly "org.apache.grails:grails-domain-class"
 
-    console "org.grails:grails-console"
+    console "org.apache.grails:grails-console"
 
-    testImplementation "org.grails:grails-gorm-testing-support"
-    testImplementation "org.grails:grails-web-testing-support"
+    testImplementation "org.apache.grails:grails-testing-support-datamapping"
+    testImplementation "org.apache.grails:grails-testing-support-web"
     testImplementation "org.spockframework:spock-core", {
         exclude group: 'org.apache.groovy'
     }
diff --git a/settings.gradle b/settings.gradle
index fa6cdbf7..8e8662cf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ plugins {
 
 def isCI = System.getenv('CI') != null
 def isLocal = !isCI
-def isAuthenticated = System.getenv('DEVELOCITY_ACCESS_KEY') != null
+def isAuthenticated = System.getenv('GRAILS_DEVELOCITY_ACCESS_KEY') != null
 
 develocity {
     server = 'https://ge.grails.org'