diff --git a/.github/scripts/releaseDistributions.sh b/.github/scripts/releaseDistributions.sh
index 15066a5..1d69443 100755
--- a/.github/scripts/releaseDistributions.sh
+++ b/.github/scripts/releaseDistributions.sh
@@ -32,8 +32,8 @@ RELEASE_TAG="$1"
 RELEASE_VERSION="${RELEASE_TAG#v}"
 SVN_USER="$2"
 SVN_PASS="$3"
-RELEASE_ROOT="https://dist.apache.org/repos/dist/release/incubator/grails/redis"
-DEV_ROOT="https://dist.apache.org/repos/dist/dev/incubator/grails/redis"
+RELEASE_ROOT="https://dist.apache.org/repos/dist/release/grails/redis"
+DEV_ROOT="https://dist.apache.org/repos/dist/dev/grails/redis"
 
 if [[ -z "${RELEASE_TAG}" ]]; then
   echo "❌ ERROR: Release Tag must not be empty." >&2
@@ -79,5 +79,5 @@ if svn_exists "${RELEASE_VERSION_URL}"; then
 fi
 
 echo "🚀 Promoting ${DEV_VERSION_URL} -> ${RELEASE_VERSION_URL}"
-svn mv "${svn_flags[@]}" -m "Promote Apache Grails (incubating) ${RELEASE_VERSION} from dev to release" "${DEV_VERSION_URL}" "${RELEASE_VERSION_URL}"
+svn mv "${svn_flags[@]}" -m "Promote Apache Grails ${RELEASE_VERSION} from dev to release" "${DEV_VERSION_URL}" "${RELEASE_VERSION_URL}"
 echo "✅ Promoted"
diff --git a/.github/vote_templates/announce.txt b/.github/vote_templates/announce.txt
index df328ab..6b52f6f 100644
--- a/.github/vote_templates/announce.txt
+++ b/.github/vote_templates/announce.txt
@@ -1,6 +1,6 @@
-The Apache Grails (incubating) community is pleased to announce the release of Apache Grails (incubating) Redis Plugin ${VERSION}.
+The Apache Grails community is pleased to announce the release of Apache Grails Redis Plugin ${VERSION}.
 
-Grails is a powerful Groovy-based web application framework for the JVM built on top of Spring Boot that has many plugins to further extend its functionality.
+Grails is a powerful Apache Groovy-based web application framework for the JVM built on top of Spring Boot that has many plugins to further extend its functionality.
 
 This Grails Redis Plugin release is another milestone on our journey to a final 7.0 release. Users are encouraged to try the milestone to provide early feedback. 
 
@@ -17,4 +17,4 @@ Grails Resources:
 - Mailing lists: https://grails.apache.org/community.html
 
 Happy Coding,
-The Apache Grails (incubating) Team
+The Apache Grails Team
diff --git a/.github/vote_templates/groovy_pmc.txt b/.github/vote_templates/groovy_pmc.txt
deleted file mode 100644
index 959eff3..0000000
--- a/.github/vote_templates/groovy_pmc.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Hi Everyone,
-
-The Apache Grails community has voted to approve the release of Apache Grails Redis Plugin ${VERSION}.
-
-As the incubation host, we now kindly request the Groovy PMC to review & approve our ASF release.
-
-Grails vote thread:
-* <VOTE THREAD LINK>
-
-Vote result thread:
-* https://<TODO>
-
-The tag for this release is:
-* (grails-redis) https://github.com/apache/grails-redis/releases/tag/v${VERSION}
-
-The artifacts to be voted on are located as follows (r${DIST_SVN_REVISION}):
-Source release: https://dist.apache.org/repos/dist/dev/incubator/grails/redis/${VERSION}/sources
-
-Release artifacts are signed with a key from the following file:
-https://dist.apache.org/repos/dist/release/incubator/grails/KEYS
-
-Please vote on releasing this package as Apache Grails (incubating) Redis Plugin ${VERSION}.
-
-Hints on validating checksums/signatures (but replace md5sum with sha512sum):
-https://www.apache.org/info/verification.html
-
-The vote for this release is open for a minimum of 72 hours.
-[ ] +1 Release Apache Grails (incubating) Redis Plugin ${VERSION}
-[ ]  0 I don't have a strong opinion about this, but I assume it's ok
-[ ] -1 Do not release Apache Grails (incubating) Redis Plugin ${VERSION} because...
diff --git a/.github/vote_templates/staged.txt b/.github/vote_templates/staged.txt
index 98db010..8178a0b 100644
--- a/.github/vote_templates/staged.txt
+++ b/.github/vote_templates/staged.txt
@@ -1,6 +1,6 @@
 Hi Everyone,
 
-I am happy to start the VOTE thread for an Apache Grails (incubating) Redis Plugin release of version ${VERSION}!
+I am happy to start the VOTE thread for an Apache Grails Redis Plugin release of version ${VERSION}!
 
 Release notes for the release are here:
 https://github.com/apache/grails-redis/releases/tag/v${VERSION}
@@ -10,25 +10,25 @@ https://github.com/apache/grails-redis/releases/tag/v${VERSION}
 Tag commit id: ${VERSION_COMMIT_ID}
 
 The artifacts to be voted on are located as follows (r${DIST_SVN_REVISION}):
-Source release: https://dist.apache.org/repos/dist/dev/incubator/grails/redis/${VERSION}/sources
+Source release: https://dist.apache.org/repos/dist/dev/grails/redis/${VERSION}/sources
 
 Release artifacts are signed with a key from the following file:
-https://dist.apache.org/repos/dist/release/incubator/grails/KEYS
+https://dist.apache.org/repos/dist/release/grails/KEYS
 
-Please vote on releasing this package as: Apache Grails (incubating) Redis Plugin ${VERSION}.
+Please vote on releasing this package as: Apache Grails Redis Plugin ${VERSION}.
 
-Reminder on ASF release approval requirements for PPMC members:
+Reminder on ASF release approval requirements for PMC members:
 https://www.apache.org/legal/release-policy.html#release-approval
 
 Hints on validating checksums/signatures (but replace md5sum with sha512sum):
 https://www.apache.org/info/verification.html
 
 The vote is open for a minimum of 72 hours and passes if a majority of at least
-three +1 PPMC votes are cast.
+three +1 PMC votes are cast.
 
-[ ] +1 Release Apache Grails (incubating) Redis Plugin ${VERSION}
+[ ] +1 Release Apache Grails Redis Plugin ${VERSION}
 [ ]  0 I don't have a strong opinion about this, but I assume it's ok
-[ ] -1 Do not release Apache Grails (incubating) Redis Plugin ${VERSION} because...
+[ ] -1 Do not release Apache Grails Redis Plugin ${VERSION} because...
 
 Here is my vote:
 
diff --git a/.github/workflows/release-abort.yml b/.github/workflows/release-abort.yml
index 70eb61e..36f9d04 100644
--- a/.github/workflows/release-abort.yml
+++ b/.github/workflows/release-abort.yml
@@ -79,7 +79,7 @@ jobs:
           export VERSION="${{ steps.release_version.outputs.value }}"
           svnmucc --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive \
                       -m "Remove grails dev version $VERSION" \
-                      rm "https://dist.apache.org/repos/dist/dev/incubator/grails/redis/$VERSION"
+                      rm "https://dist.apache.org/repos/dist/dev/grails/redis/$VERSION"
       - name: "Cancel GitHub Actions"
         continue-on-error: true
         env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b57e769..276dd40 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -178,7 +178,7 @@ jobs:
           find . -depth \( -type f -o -type d \) -exec touch -d "@${SOURCE_DATE_EPOCH}" {} +
       - name: "📦 Create source distribution ZIP"
         run: |
-          zip -r "apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip" ${{ needs.publish.outputs.extract_repository_name }} -x '${{ needs.publish.outputs.extract_repository_name }}/.git/*' -x '${{ needs.publish.outputs.extract_repository_name }}/.github/*'
+          zip -r "apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip" ${{ needs.publish.outputs.extract_repository_name }} -x '${{ needs.publish.outputs.extract_repository_name }}/.git/*' -x '${{ needs.publish.outputs.extract_repository_name }}/.github/*'
       - name: '🔐 Set up GPG'
         run: |
           echo "${{ secrets.GRAILS_GPG_KEY }}" | gpg --batch --import
@@ -189,19 +189,19 @@ jobs:
         env:
           GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
         run: |
-          gpg --default-key "${GPG_KEY_ID}" --batch --yes --pinentry-mode loopback --armor --detach-sign ./apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip
+          gpg --default-key "${GPG_KEY_ID}" --batch --yes --pinentry-mode loopback --armor --detach-sign ./apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip
       - name: "📦 Create source distribution checksum"
         run: |
-          sha512sum ./apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip > "apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip.sha512"
-          cat ./apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip.sha512
+          sha512sum ./apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip > "apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip.sha512"
+          cat ./apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip.sha512
       - name: "🚀 Upload ZIP and Signature to GitHub Release"
         uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
         with:
           tag_name: v${{ needs.publish.outputs.release_version }}
           files: |
-            apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip
-            apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip.sha512
-            apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-incubating-src.zip.asc
+            apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip
+            apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip.sha512
+            apache-${{ needs.publish.outputs.extract_repository_name }}-${{ needs.publish.outputs.release_version }}-src.zip.asc
       - name: "🗑️ Remove CHECKSUMS.txt asset from release"
         working-directory: '${{ needs.publish.outputs.extract_repository_name }}'
         env:
@@ -253,29 +253,29 @@ jobs:
         run: |
           set -e
 
-          if svn ls https://dist.apache.org/repos/dist/dev/incubator/grails --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive; then
+          if svn ls https://dist.apache.org/repos/dist/dev/grails --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive; then
             echo "Dev Folder 'grails' already exists — skipping creation"
           else
             echo "Dev Folder 'grails' does not exist, creating"
             svnmucc --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive \
-              mkdir https://dist.apache.org/repos/dist/dev/incubator/grails \
+              mkdir https://dist.apache.org/repos/dist/dev/grails \
               -m "Create 'grails' dev folder"
           fi
       - name: "👀 Ensure grails redis folder exists"
         run: |
           set -e
 
-          if svn ls https://dist.apache.org/repos/dist/dev/incubator/grails/redis --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive; then
+          if svn ls https://dist.apache.org/repos/dist/dev/grails/redis --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive; then
             echo "Dev Folder 'grails/redis' already exists — skipping creation"
           else
             echo "Dev Folder 'grails/redis' does not exist, creating"
             svnmucc --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive \
-              mkdir https://dist.apache.org/repos/dist/dev/incubator/grails/redis \
+              mkdir https://dist.apache.org/repos/dist/dev/grails/redis \
               -m "Create 'grails redis' dev folder"
           fi
       - name: "📥 Checkout dev repo"
         run: |
-          svn checkout --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive https://dist.apache.org/repos/dist/dev/incubator/grails/redis dev-repo
+          svn checkout --username "$SVN_USERNAME" --password "$SVN_PASSWORD" --non-interactive https://dist.apache.org/repos/dist/dev/grails/redis dev-repo
       - name: "🗑️ Remove existing dev version"
         run: |
           export VERSION="${{ needs.publish.outputs.release_version }}"
@@ -293,9 +293,9 @@ jobs:
           cd dev-repo
           mkdir -p $VERSION/sources          
           cd $VERSION/sources
-          curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-${{ needs.publish.outputs.extract_repository_name }}-$VERSION-incubating-src.zip
-          curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-${{ needs.publish.outputs.extract_repository_name }}-$VERSION-incubating-src.zip.sha512
-          curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-${{ needs.publish.outputs.extract_repository_name }}-$VERSION-incubating-src.zip.asc
+          curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-${{ needs.publish.outputs.extract_repository_name }}-$VERSION-src.zip
+          curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-${{ needs.publish.outputs.extract_repository_name }}-$VERSION-src.zip.sha512
+          curl -f -LO https://github.com/apache/${{ needs.publish.outputs.extract_repository_name }}/releases/download/$TAG/apache-${{ needs.publish.outputs.extract_repository_name }}-$VERSION-src.zip.asc
           echo "Downloaded the following files:"
           ls -l
       - name: "Upload distributions"
@@ -332,31 +332,15 @@ jobs:
         run: |
           export DIST_SVN_REVISION=$(awk '/Last Changed Rev:/ {print $4}' dev-repo/DIST_SVN_REVISION.txt)
           
-          echo "::group::Grails PPMC Vote Email"
+          echo "::group::Grails PMC Vote Email"
           echo "*************************************************"
-          echo "Subject: [VOTE] Release Apache Grails (incubating) Redis Plugin ${VERSION}"
+          echo "Subject: [VOTE] Release Apache Grails Redis Plugin ${VERSION}"
           echo "*************************************************"
           echo "Body:"
           echo "*************************************************"
           cat ${{ needs.publish.outputs.extract_repository_name }}/.github/vote_templates/staged.txt | envsubst
           echo "*************************************************"          
           echo "::endgroup::"
-      - name: '📧 Print Groovy Vote Email'
-        env:
-          VERSION: ${{ needs.publish.outputs.release_version }}
-          VERSION_COMMIT_ID: ${{ needs.publish.outputs.commit_hash }}
-        run: |
-          export DIST_SVN_REVISION=$(awk '/Last Changed Rev:/ {print $4}' dev-repo/DIST_SVN_REVISION.txt)
-          
-          echo "::group::Grails PPMC Vote Email"
-          echo "*************************************************"
-          echo "Subject: [VOTE] Approval of Apache Grails (incubating) Redis Plugin ${VERSION} release by Groovy PMC"
-          echo "*************************************************"
-          echo "Body:"
-          echo "*************************************************"
-          cat ${{ needs.publish.outputs.extract_repository_name }}/.github/vote_templates/groovy_pmc.txt | envsubst
-          echo "*************************************************"
-          echo "::endgroup::"
   release:
     environment: release
     name: 'VOTE SUCCEEDED - Release Artifacts'
@@ -367,12 +351,7 @@ jobs:
         run: curl -s https://api.ipify.org
       - name: "Setup SVN and Tools"
         run: sudo apt-get install -y subversion subversion-tools tree gettext-base
-      - name: "🗳 Grails PPMC Vote Confirmation - MANUAL"
-        run: |
-          echo "::group::Manual Confirmation"
-          echo "🔎 This step is a placeholder that the vote confirmation on dev@grails.apache.org completed successfully."
-          echo "::endgroup::"
-      - name: "🗳 Groovy PMC Vote Confirmation - MANUAL"
+      - name: "🗳 Grails PMC Vote Confirmation - MANUAL"
         run: |
           echo "::group::Manual Confirmation"
           echo "🔎 This step is a placeholder that the vote confirmation on dev@grails.apache.org completed successfully."
@@ -392,7 +371,6 @@ jobs:
           echo "::group::Manual ASF Reporter Update"
           TODAY=$(date +"%Y-%m-%d")
           echo "Check email & update https://reporter.apache.org to mark the release ${{ needs.publish.outputs.release_version }} as complete as of ${TODAY}"
-          echo "Note: this is a place holder; currently this is not possible since Groovy sponsors us instead of the incubator PMC"
           echo "::endgroup::"
   docs:
     environment: docs
@@ -470,7 +448,7 @@ jobs:
 
           echo "::group::Announcement Email"
           echo "*************************************************"
-          echo "Subject: [ANNOUNCE] Apache Grails (incubating) Redis Plugin ${VERSION}"
+          echo "Subject: [ANNOUNCE] Apache Grails Redis Plugin ${VERSION}"
           echo "*************************************************"
           echo "Body:"
           echo "*************************************************"
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 9af3eb8..dad7258 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,6 +1,6 @@
 # Code of Conduct
 
-Apache Grails (Incubating) follows the ASF [Code of Conduct](https://www.apache.org/foundation/policies/conduct).
+Apache Grails follows the ASF [Code of Conduct](https://www.apache.org/foundation/policies/conduct).
 
 If you observe behavior that violates those rules please follow the
 [ASF reporting guidelines](https://www.apache.org/foundation/policies/conduct#reporting-guidelines).
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index d5b62af..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1 +0,0 @@
-Apache Grails is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Groovy Project. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
\ No newline at end of file
diff --git a/etc/bin/download-release-artifacts.sh b/etc/bin/download-release-artifacts.sh
index 1dae419..aab32e4 100755
--- a/etc/bin/download-release-artifacts.sh
+++ b/etc/bin/download-release-artifacts.sh
@@ -37,37 +37,37 @@ VERSION=${RELEASE_TAG#v}
 
 # Source distro
 echo "Downloading GitHub Release files"
-curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip"
-curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc"
-curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512"
+curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-src.zip" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-src.zip"
+curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-src.zip.asc" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-src.zip.asc"
+curl -f -L -o "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512" "https://github.com/${REPO_NAME}/releases/download/${RELEASE_TAG}/apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512"
 
 echo "Downloading SVN Release files"
-curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip" "https://dist.apache.org/repos/dist/dev/incubator/grails/${SVN_FOLDER}/${VERSION}/sources/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip"
-curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc" "https://dist.apache.org/repos/dist/dev/incubator/grails/${SVN_FOLDER}/${VERSION}/sources/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc"
-curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512" "https://dist.apache.org/repos/dist/dev/incubator/grails/${SVN_FOLDER}/${VERSION}/sources/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512"
+curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-src.zip" "https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/sources/apache-${PROJECT_NAME}-${VERSION}-src.zip"
+curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-src.zip.asc" "https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/sources/apache-${PROJECT_NAME}-${VERSION}-src.zip.asc"
+curl -f -L -o "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512" "https://dist.apache.org/repos/dist/dev/grails/${SVN_FOLDER}/${VERSION}/sources/apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512"
 
 echo "Comparing SVN vs GitHub Release files"
 set +e
 
-cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc"
+cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-src.zip.asc" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-src.zip.asc"
 if [ $? -eq 0 ]; then
-  echo "✅ Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc"
+  echo "✅ Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-src.zip.asc"
 else
-  echo "❌Different SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc"
+  echo "❌Different SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-src.zip.asc"
   exit 1
 fi
 
 set +e
-cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512"
+cmp -s "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512" "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512"
 if [ $? -eq 0 ]; then
-  echo "✅ Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512"
+  echo "✅ Identical SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512"
 else
-  echo "❌ Different SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512"
+  echo "❌ Different SVN vs GitHub Upload for apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512"
   exit 1
 fi
 
-ZIP_SVN_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip" | awk '{print $1}')
-ZIP_GITHUB_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip" | awk '{print $1}')
+ZIP_SVN_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/apache-${PROJECT_NAME}-${VERSION}-src.zip" | awk '{print $1}')
+ZIP_GITHUB_CHECKSUM=$(shasum -a 512 "${DOWNLOAD_LOCATION}/github-apache-${PROJECT_NAME}-${VERSION}-src.zip" | awk '{print $1}')
 if [ "${ZIP_SVN_CHECKSUM}" != "${ZIP_GITHUB_CHECKSUM}" ]; then
     echo "❌ Checksum mismatch between SVN and GitHub source zip files"
     exit 1
diff --git a/etc/bin/verify-source-distribution.sh b/etc/bin/verify-source-distribution.sh
index d13eeb5..8a5968c 100755
--- a/etc/bin/verify-source-distribution.sh
+++ b/etc/bin/verify-source-distribution.sh
@@ -32,10 +32,10 @@ fi
 VERSION=${RELEASE_TAG#v}
 
 cd "${DOWNLOAD_LOCATION}"
-ZIP_FILE=$(ls "apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip" 2>/dev/null | head -n 1)
+ZIP_FILE=$(ls "apache-${PROJECT_NAME}-${VERSION}-src.zip" 2>/dev/null | head -n 1)
 
 if [ -z "${ZIP_FILE}" ]; then
-  echo "Error: Could not find apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip in ${DOWNLOAD_LOCATION}"
+  echo "Error: Could not find apache-${PROJECT_NAME}-${VERSION}-src.zip in ${DOWNLOAD_LOCATION}"
   exit 1
 fi
 
@@ -46,7 +46,7 @@ cleanup() {
 trap cleanup EXIT
 
 echo "Verifying checksum..."
-shasum -a 512 -c "apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.sha512"
+shasum -a 512 -c "apache-${PROJECT_NAME}-${VERSION}-src.zip.sha512"
 echo "✅ Checksum Verified"
 
 echo "Importing GPG key to independent GPG home ..."
@@ -54,7 +54,7 @@ gpg --homedir "${GRAILS_GPG_HOME}" --import "${DOWNLOAD_LOCATION}/KEYS"
 echo "✅ GPG Key Imported"
 
 echo "Verifying GPG signature..."
-gpg --homedir "${GRAILS_GPG_HOME}" --verify "apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip.asc" "apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip"
+gpg --homedir "${GRAILS_GPG_HOME}" --verify "apache-${PROJECT_NAME}-${VERSION}-src.zip.asc" "apache-${PROJECT_NAME}-${VERSION}-src.zip"
 echo "✅ GPG Verified"
 
 SRC_DIR="${PROJECT_NAME}"
@@ -70,7 +70,7 @@ if [ -d "${SRC_DIR}" ]; then
   cd "${DOWNLOAD_LOCATION}"
 fi
 echo "Extracting zip file..."
-unzip -q "apache-${PROJECT_NAME}-${VERSION}-incubating-src.zip"
+unzip -q "apache-${PROJECT_NAME}-${VERSION}-src.zip"
 
 if [ ! -d "${SRC_DIR}" ]; then
   echo "Error: Expected extracted folder '${SRC_DIR}' not found."
@@ -78,7 +78,7 @@ if [ ! -d "${SRC_DIR}" ]; then
 fi
 
 echo "Checking for required files existence..."
-REQUIRED_FILES=("LICENSE" "NOTICE" "README.md" "PUBLISHED_ARTIFACTS" "CHECKSUMS" "BUILD_DATE" "DISCLAIMER")
+REQUIRED_FILES=("LICENSE" "NOTICE" "README.md" "PUBLISHED_ARTIFACTS" "CHECKSUMS" "BUILD_DATE")
 
 for FILE in "${REQUIRED_FILES[@]}"; do
   if [ ! -f "${SRC_DIR}/$FILE" ]; then
diff --git a/etc/bin/verify.sh b/etc/bin/verify.sh
index d478763..dfa1fe9 100755
--- a/etc/bin/verify.sh
+++ b/etc/bin/verify.sh
@@ -41,7 +41,7 @@ trap cleanup ERR
 cd "${DOWNLOAD_LOCATION}"
 
 echo "Downloading KEYS file ..."
-curl -sSfLO "https://dist.apache.org/repos/dist/release/incubator/grails/KEYS"
+curl -sSfLO "https://dist.apache.org/repos/dist/release/grails/KEYS"
 echo "✅ KEYS Downloaded"
 
 echo "Downloading Artifacts ..."