diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index ac0a0c443..76633bf16 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -36,7 +36,7 @@ jobs:
         run: ./gradlew docs:docs
       - name: "👀 Determine docs target repository"
         run: |
-          if [ "${{ github.repository }}" = "grails/gorm-hibernate5" ]; then
+          if [ "${{ github.repository }}" = "grails/grails-data-hibernate5" ]; then
             DOCS_TARGET_REPOSITORY="grails/grails-data-mapping"
           else
             DOCS_TARGET_REPOSITORY="${{ github.repository }}"
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 85a5cb20d..8a4234881 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -63,7 +63,7 @@ jobs:
         run: ./gradlew docs:docs
       - name: "👀 Determine docs target repository"
         run: |
-          if [ "${{ github.repository }}" = "grails/gorm-hibernate5" ]; then
+          if [ "${{ github.repository }}" = "grails/grails-data-hibernate5" ]; then
             DOCS_TARGET_REPOSITORY="grails/grails-data-mapping"
           else
             DOCS_TARGET_REPOSITORY="${{ github.repository }}"
diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml
index 29c7ee8cc..b738b60fa 100644
--- a/.github/workflows/groovy-joint-workflow.yml
+++ b/.github/workflows/groovy-joint-workflow.yml
@@ -74,7 +74,8 @@ jobs:
           echo "    server = 'https://ge.grails.org'" >> $GITHUB_OUTPUT
           echo "    buildScan {" >> $GITHUB_OUTPUT
           echo "        tag('groovy')" >> $GITHUB_OUTPUT
-          echo "        tag('gorm-hibernate5')" >> $GITHUB_OUTPUT
+          echo "        tag('grails-data-hibernate5')" >> $GITHUB_OUTPUT
+          echo "        tag('grails-database-migration')" >> $GITHUB_OUTPUT
           echo "        publishing.onlyIf { isAuthenticated }" >> $GITHUB_OUTPUT
           echo "        uploadInBackground = false" >> $GITHUB_OUTPUT
           echo "    }" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6fe470b6d..fd06a8566 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -134,7 +134,7 @@ jobs:
         uses: grails/github-actions/export-gradle-properties@v3
       - name: "👀 Determine docs target repository"
         run: |
-          if [ "${{ github.repository }}" = "grails/gorm-hibernate5" ]; then
+          if [ "${{ github.repository }}" = "grails/grails-data-hibernate5" ]; then
             DOCS_TARGET_REPOSITORY="grails/grails-data-mapping"
           else
             DOCS_TARGET_REPOSITORY="${{ github.repository }}"
diff --git a/settings.gradle b/settings.gradle
index af35c8b95..53225d67c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,7 +11,7 @@ develocity {
     server = 'https://ge.grails.org'
     buildScan {
         tag('grails')
-        tag('gorm-hibernate5')
+        tag('grails-data-hibernate5')
         tag('grails-database-migration')
         publishing.onlyIf { isAuthenticated }
         uploadInBackground = isLocal