diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 2fc1b1e12d8..bd14c489ee2 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -31,7 +31,7 @@ body:
         encountered with the community. For best practices, if it is indeed a bug, please try your best to provide the reproducible
         steps. If you want to ask questions or share ideas, please [subscribe to our mailing list](mailto:dev-subscribe@kyuubi.apache.org)
         and send emails to [our mailing list](mailto:dev@kyuubi.apache.org), you can also head to our
-        [Discussions](https://github.com/apache/incubator-kyuubi/discussions) tab.
+        [Discussions](https://github.com/apache/kyuubi/discussions) tab.
 
   - type: checkboxes
     attributes:
@@ -47,7 +47,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues?q=is%3Aissue) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues?q=is%3Aissue) and found no similar
             issues.
           required: true
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 25d75f99627..da51358016f 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -18,11 +18,11 @@
 blank_issues_enabled: false
 contact_links:
   - name: Ask a question or get support
-    url: https://github.com/apache/incubator-kyuubi/discussions/categories/q-a
+    url: https://github.com/apache/kyuubi/discussions/categories/q-a
     about: Ask a question or request support for using Apache Kyuubi
   - name: Tell us your success story or use case
-    url: https://github.com/apache/incubator-kyuubi/discussions/925
+    url: https://github.com/apache/kyuubi/discussions/925
     about: Tell us your success story or use case using Apache Kyuubi
   - name: Kyuubi project improvement proposal
-    url: https://github.com/apache/incubator-kyuubi/discussions/categories/ideas
+    url: https://github.com/apache/kyuubi/discussions/categories/ideas
     about: a.k.a KPIP
diff --git a/.github/ISSUE_TEMPLATE/doc-improvement-report.yml b/.github/ISSUE_TEMPLATE/doc-improvement-report.yml
index 6234a1eaf81..668ddb25695 100644
--- a/.github/ISSUE_TEMPLATE/doc-improvement-report.yml
+++ b/.github/ISSUE_TEMPLATE/doc-improvement-report.yml
@@ -39,7 +39,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues?q=is%3Aissue) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues?q=is%3Aissue) and found no similar
             issues.
           required: true
 
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 287a064d848..b9236d70178 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -39,7 +39,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues?q=is%3Aissue) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues?q=is%3Aissue) and found no similar
             issues.
           required: true
 
diff --git a/.github/ISSUE_TEMPLATE/improve-test.yml b/.github/ISSUE_TEMPLATE/improve-test.yml
index 36870d7de41..85109b92abe 100644
--- a/.github/ISSUE_TEMPLATE/improve-test.yml
+++ b/.github/ISSUE_TEMPLATE/improve-test.yml
@@ -39,7 +39,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues?q=is%3Aissue) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues?q=is%3Aissue) and found no similar
             issues.
           required: true
 
diff --git a/.github/ISSUE_TEMPLATE/improvement.yml b/.github/ISSUE_TEMPLATE/improvement.yml
index 5842aa45e31..cc5a0351c48 100644
--- a/.github/ISSUE_TEMPLATE/improvement.yml
+++ b/.github/ISSUE_TEMPLATE/improvement.yml
@@ -41,7 +41,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues?q=is%3Aissue) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues?q=is%3Aissue) and found no similar
             issues.
           required: true
 
diff --git a/.github/ISSUE_TEMPLATE/subtask.yml b/.github/ISSUE_TEMPLATE/subtask.yml
index 32edf48362d..fb05a62dcd4 100644
--- a/.github/ISSUE_TEMPLATE/subtask.yml
+++ b/.github/ISSUE_TEMPLATE/subtask.yml
@@ -35,7 +35,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues) and found no similar
             issues.
           required: true
 
diff --git a/.github/ISSUE_TEMPLATE/umbrella.yml b/.github/ISSUE_TEMPLATE/umbrella.yml
index 1e20d8c617a..d2d0762a76d 100644
--- a/.github/ISSUE_TEMPLATE/umbrella.yml
+++ b/.github/ISSUE_TEMPLATE/umbrella.yml
@@ -35,7 +35,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues) and found no similar
             issues.
           required: true
 
diff --git a/build/release/generate_changelog.sh b/build/release/generate_changelog.sh
index edb9eb2457a..2429544514d 100755
--- a/build/release/generate_changelog.sh
+++ b/build/release/generate_changelog.sh
@@ -26,7 +26,7 @@ KYUUBI_DIR="$(cd "$(dirname "$0")"/../..; pwd)"
 CHANGELOG_DIR=$KYUUBI_DIR/docs/changelog
 RELEASE_VERSION="$(echo $CURRENT_RELEASE_TAG | cut -d "-" -f 1,2)"  ## use cut to remove -rc symbol
 CHANGELOG_PATH=$CHANGELOG_DIR/"$RELEASE_VERSION.md"
-KYUUBI_GITHUB_COMMIT_URL="https://github.com/apache/incubator-kyuubi/commit/"
+KYUUBI_GITHUB_COMMIT_URL="https://github.com/apache/kyuubi/commit/"
 
 function usage {
   set +x
diff --git a/build/release/release.sh b/build/release/release.sh
index ea5234d4398..4afac386520 100755
--- a/build/release/release.sh
+++ b/build/release/release.sh
@@ -54,8 +54,8 @@ fi
 
 RELEASE_TAG="v${RELEASE_VERSION}-rc${RELEASE_RC_NO}"
 
-SVN_STAGING_REPO="https://dist.apache.org/repos/dist/dev/incubator/kyuubi"
-SVN_RELEASE_REPO="https://dist.apache.org/repos/dist/release/incubator/kyuubi"
+SVN_STAGING_REPO="https://dist.apache.org/repos/dist/dev/kyuubi"
+SVN_RELEASE_REPO="https://dist.apache.org/repos/dist/release/kyuubi"
 
 KYUUBI_DIR="$(cd "$(dirname "$0")"/../..; pwd)"
 RELEASE_DIR="${KYUUBI_DIR}/work/release"
diff --git a/build/release/script/announce.sh b/build/release/script/announce.sh
index a5acb93459b..7d8fbaba0e4 100644
--- a/build/release/script/announce.sh
+++ b/build/release/script/announce.sh
@@ -47,16 +47,15 @@ Hi all,
 The Apache Kyuubi community is pleased to announce that
 Apache Kyuubi ${release_version} has been released!
 
-Apache Kyuubi is a distributed multi-tenant JDBC server for
-large-scale data processing and analytics, built on top of Apache Spark
-and designed to support more engines (i.e. Apache Flink).
+Apache Kyuubi is a distributed and multi-tenant gateway to provide
+serverless SQL on data warehouses and lakehouses.
 
 Kyuubi provides a pure SQL gateway through Thrift JDBC/ODBC interface
 for end-users to manipulate large-scale data with pre-programmed and
 extensible Spark SQL engines.
 
 We are aiming to make Kyuubi an "out-of-the-box" tool for data warehouses
-and data lakes.
+and lakehouses.
 
 This "out-of-the-box" model minimizes the barriers and costs for end-users
 to use Spark at the client side.
@@ -82,5 +81,5 @@ Thanks,
 On behalf of Apache Kyuubi community
 EOF
 
-echo "please Use general@incubator.apache.org, announce@apache.org, dev@kyuubi.apache.org, user@spark.apache.org
+echo "please Use announce@apache.org, dev@kyuubi.apache.org, user@spark.apache.org
 see announce content in $ANNOUNCE"
diff --git a/build/release/script/dev_kyuubi_vote.sh b/build/release/script/dev_kyuubi_vote.sh
index 6b5d96acead..5b2ef225dba 100644
--- a/build/release/script/dev_kyuubi_vote.sh
+++ b/build/release/script/dev_kyuubi_vote.sh
@@ -78,7 +78,7 @@ cat >${DEV_VOTE}<<EOF
 Title: [VOTE] Release Apache Kyuubi ${release_version} ${release_rc_no}
 
 Content:
-Hello Apache Kyuubi PPMC and Community,
+Hello Apache Kyuubi PMC and Community,
 
 Please vote on releasing the following candidate as
 Apache Kyuubi version ${release_version}.
@@ -93,13 +93,13 @@ To learn more about Apache Kyuubi, please see
 https://kyuubi.apache.org/
 
 The tag to be voted on is ${release_rc_tag} (commit ${git_commit_hash}):
-https://github.com/apache/incubator-kyuubi/tree/${release_rc_tag}
+https://github.com/apache/kyuubi/tree/${release_rc_tag}
 
 The release files, including signatures, digests, etc. can be found at:
-https://dist.apache.org/repos/dist/dev/incubator/kyuubi/${release_rc_tag}/
+https://dist.apache.org/repos/dist/dev/kyuubi/${release_rc_tag}/
 
 Signatures used for Kyuubi RCs can be found in this file:
-https://downloads.apache.org/incubator/kyuubi/KEYS
+https://downloads.apache.org/kyuubi/KEYS
 
 The staging repository for this release can be found at:
 https://repository.apache.org/content/repositories/orgapachekyuubi-${repo_no}/
diff --git a/build/release/script/general_incubator_vote.sh b/build/release/script/general_incubator_vote.sh
deleted file mode 100644
index bc37b70479a..00000000000
--- a/build/release/script/general_incubator_vote.sh
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-
-set -o pipefail
-set -e
-
-RELEASE_DIR="$(cd "$(dirname "$0")"/..; pwd)"
-######### Please modify the variables ##########
-# release version, e.g. v1.7.0
-release_version=${release_version:-""}
-# release candidate number, e.g. rc2
-release_rc_no=${release_rc_no:-""}
-# previous release candidate number, e.g. rc1, could be empty if it is the first vote
-prev_release_rc_no=${prev_release_rc_no:-""}
-# previous release version, e.g. v1.6.0, this is used to generate change log
-prev_release_version=${prev_release_version:-""}
-# staging repository number, check it under https://repository.apache.org/content/repositories
-repo_no=${repo_no:-""}
-# vote email address in dev@kyuubi.apache.org, e.g. https://www.mail-archive.com/dev@kyuubi.apache.org/msg01458.html
-dev_kyuubi_vote_mail_address=${dev_kyuubi_vote_mail_address:-""}
-# vote result email address in dev@kyuubi.apache.org, e.g. https://www.mail-archive.com/dev@kyuubi.apache.org/msg01492.html
-dev_kyuubi_vote_result_mail_address=${dev_kyuubi_vote_result_mail_address:-""}
-################################################
-
-if [[ -z $release_version ]]; then
-  echo "Please input release version"
-  exit 1
-fi
-if [[ -z $release_rc_no ]]; then
-  echo "Please input release rc number"
-  exit 1
-fi
-if [[ -z $prev_release_version ]]; then
-  echo "Please input prev release version which is used to generate change log"
-  exit 1
-fi
-if [[ -z $repo_no ]]; then
-  echo "Please input staging repository number, check it under https://repository.apache.org/content/repositories"
-  exit 1
-fi
-if [[ -z $dev_kyuubi_vote_mail_address ]]; then
-  echo "Please input vote email address in dev@kyuubi.apache.org"
-  exit 1
-fi
-if [[ -z $dev_kyuubi_vote_result_mail_address ]]; then
-  echo "vote result email address in dev@kyuubi.apache.org"
-  exit 1
-fi
-
-release_rc_tag=${release_version}-${release_rc_no}
-git_commit_hash=$(git rev-list -n 1 $release_rc_tag)
-
-echo "Release version: ${release_version}"
-echo "Release candidate number: ${release_rc_no}"
-echo "Previous release candidate number: ${prev_release_rc_no}"
-echo "Staging repository number: ${repo_no}"
-echo "Vote email address in dev@kyuubi.apache.org: ${dev_kyuubi_vote_mail_address}"
-echo "Vote result email address in dev@kyuubi.apache.org: ${dev_kyuubi_vote_result_mail_address}"
-echo "Release candidate tag: ${release_rc_tag}"
-echo "Release candidate tag commit hash: ${git_commit_hash}"
-
-if [[ ! -z "$prev_release_rc_no" ]]; then
-  prev_release_rc_tag=${release_version}-${prev_release_rc_no}
-  change_from_pre_commit="
-The commit list since the ${prev_release_rc_no}:
-https://github.com/apache/incubator-kyuubi/compare/${prev_release_rc_tag}...${release_rc_tag}
-"
-fi
-
-RELEASE_TEMP_DIR=${RELEASE_DIR}/tmp
-mkdir -p ${RELEASE_TEMP_DIR}
-GENERAL_VOTE=${RELEASE_TEMP_DIR}/${release_rc_tag}_general_vote.temp
-
-cat >$GENERAL_VOTE<<EOF
-Title: [VOTE] Release Apache Kyuubi ${release_version} ${release_rc_no}
-
-Content:
-Hello Incubator Community,
-
-The Apache Kyuubi community has voted on and approved a proposal to release
-Apache Kyuubi version ${release_version} ${release_rc_no}.
-
-We now kindly request the Incubator PMC members review and vote on this
-incubator release.
-
-Kyuubi community vote thread:
-${dev_kyuubi_vote_mail_address}
-
-Vote result thread:
-${dev_kyuubi_vote_result_mail_address}
-
-[ ] +1 Release this package as Apache Kyuubi ${release_version}
-[ ] +0
-[ ] -1 Do not release this package because ...
-
-To learn more about Apache Kyuubi, please see
-https://kyuubi.apache.org/
-
-The tag to be voted on is ${release_rc_tag} (commit ${git_commit_hash}):
-https://github.com/apache/kyuubi/tree/${release_rc_tag}
-
-The release files, including signatures, digests, etc. can be found at:
-https://dist.apache.org/repos/dist/dev/kyuubi/${release_rc_tag}/
-
-Signatures used for Kyuubi RCs can be found in this file:
-https://downloads.apache.org/incubator/kyuubi/KEYS
-
-The staging repository for this release can be found at:
-https://repository.apache.org/content/repositories/orgapachekyuubi-${repo_no}/
-$change_from_pre_commit
-The release note is available in:
-https://github.com/apache/kyuubi/compare/${prev_release_version}...${release_rc_tag}
-
-
-Thanks,
-On behalf of Apache Kyuubi community
-EOF
-
-echo "please use general@incubator.apache.org
-see vote content in $GENERAL_VOTE
-please check all the links and ensure they are available"
diff --git a/build/release/tmpl/dev_kyuubi_cancel_vote.tmpl b/build/release/tmpl/dev_kyuubi_cancel_vote.tmpl
index 27e8429d648..2e4add4203a 100644
--- a/build/release/tmpl/dev_kyuubi_cancel_vote.tmpl
+++ b/build/release/tmpl/dev_kyuubi_cancel_vote.tmpl
@@ -18,7 +18,7 @@
 Title: [CANCEL][VOTE] Release Apache Kyuubi {release_version} {release_rc_no}
 
 Content:
-Hello Apache Kyuubi PPMC and Community,
+Hello Apache Kyuubi PMC and Community,
 
 We need to cancel the {release_rc_no} due to {issue_description}[1],
 and thank everyone who helped vote.
diff --git a/build/release/tmpl/dev_kyuubi_vote_result.tmpl b/build/release/tmpl/dev_kyuubi_vote_result.tmpl
index c0723d22332..82dfa52fc15 100644
--- a/build/release/tmpl/dev_kyuubi_vote_result.tmpl
+++ b/build/release/tmpl/dev_kyuubi_vote_result.tmpl
@@ -18,7 +18,7 @@
 Title: [RESULT][VOTE] Release Apache Kyuubi {release_version} {release_rc_no}
 
 Content:
-Hello Apache Kyuubi PPMC and Community,
+Hello Apache Kyuubi PMC and Community,
 
 The vote closes now as 72hr have passed. The vote PASSES with
 
@@ -36,11 +36,8 @@ The vote closes now as 72hr have passed. The vote PASSES with
 The vote thread:
 {dev_kyuubi_vote_mail_address}
 
-I will now bring the vote to general@incubator.apache.org to get approval
-by the IPMC.
-If this vote passes also, the release is accepted and will be published.
-
-Thanks to all who helped with the release!
+Thanks to all who helped with the release! I will be working
+on publishing the artifacts soon.
 
 Thanks,
 On behalf of Apache Kyuubi community
diff --git a/build/release/tmpl/general_incubator_vote_result.tmpl b/build/release/tmpl/general_incubator_vote_result.tmpl
deleted file mode 100644
index b1aad5af40a..00000000000
--- a/build/release/tmpl/general_incubator_vote_result.tmpl
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-
-Title: [RESULT][VOTE] Release Apache Kyuubi(Incubating) {release_version} {release_rc_no}
-
-Content:
-Hi all,
-
-Thanks for reviewing and voting for Apache Kyuubi(Incubating)
-{release_version} {release_rc_no} release, I am happy to announce
-the release voting has passed with
-
-(* = binding)
-+1:
-- {AA}*
-- {BB}
-- {CC}*
-- {DD}*
-
-+0: None
-
--1: None
-
-The voting thread is:
-{general_incubator_vote_mail_address}
-
-Many thanks for all our mentors helping us with the release procedure,
-and all IPMC helped us to review and vote for Apache Kyuubi(Incubating)
-release. I will be working on publishing the artifacts soon.
-
-Thanks,
-On behalf of Apache Kyuubi(Incubating) community
diff --git a/charts/kyuubi/Chart.yaml b/charts/kyuubi/Chart.yaml
index d72530cca2d..6b377ecc5d1 100644
--- a/charts/kyuubi/Chart.yaml
+++ b/charts/kyuubi/Chart.yaml
@@ -22,6 +22,6 @@ type: application
 version: 0.1.0
 appVersion: "master-snapshot"
 home: https://kyuubi.apache.org
-icon: https://raw.githubusercontent.com/apache/incubator-kyuubi/master/docs/imgs/logo.png
+icon: https://raw.githubusercontent.com/apache/kyuubi/master/docs/imgs/logo.png
 sources:
-  - https://github.com/apache/incubator-kyuubi
+  - https://github.com/apache/kyuubi
diff --git a/docker/playground/image/kyuubi-playground-kyuubi.Dockerfile b/docker/playground/image/kyuubi-playground-kyuubi.Dockerfile
index 3873544b9a0..7450c2f63cf 100644
--- a/docker/playground/image/kyuubi-playground-kyuubi.Dockerfile
+++ b/docker/playground/image/kyuubi-playground-kyuubi.Dockerfile
@@ -25,7 +25,7 @@ ENV KYUUBI_HOME=/opt/kyuubi
 ENV KYUUBI_CONF_DIR=/etc/kyuubi/conf
 
 RUN set -x && \
-    wget -q ${APACHE_MIRROR}/incubator/kyuubi/kyuubi-${KYUUBI_VERSION}/apache-kyuubi-${KYUUBI_VERSION}-bin.tgz && \
+    wget -q ${APACHE_MIRROR}/kyuubi/kyuubi-${KYUUBI_VERSION}/apache-kyuubi-${KYUUBI_VERSION}-bin.tgz && \
     tar -xzf apache-kyuubi-${KYUUBI_VERSION}-bin.tgz -C /opt && \
     ln -s /opt/apache-kyuubi-${KYUUBI_VERSION}-bin ${KYUUBI_HOME} && \
     rm apache-kyuubi-${KYUUBI_VERSION}-bin.tgz && \
diff --git a/docs/client/python/pyspark.md b/docs/client/python/pyspark.md
index 2ec6f27cca1..2039b250cd1 100644
--- a/docs/client/python/pyspark.md
+++ b/docs/client/python/pyspark.md
@@ -39,7 +39,7 @@ Prepare JDBC driver jar file. Supported Hive compatible JDBC Driver as below:
 
 | Driver     | Driver Class Name | Remarks|
 | ---------- | ----------------- | ----- |
-| Kyuubi Hive Driver ([doc](../jdbc/kyuubi_jdbc.html))| org.apache.kyuubi.jdbc.KyuubiHiveDriver |  Compile for the driver on master branch, as [KYUUBI #3484](https://github.com/apache/incubator-kyuubi/pull/3485) required by Spark JDBC source not yet included in released version.
+| Kyuubi Hive Driver ([doc](../jdbc/kyuubi_jdbc.html))| org.apache.kyuubi.jdbc.KyuubiHiveDriver |  Compile for the driver on master branch, as [KYUUBI #3484](https://github.com/apache/kyuubi/pull/3485) required by Spark JDBC source not yet included in released version.
 | Hive Driver ([doc](../jdbc/hive_jdbc.html))| org.apache.hive.jdbc.HiveDriver | 
 
 Refer to docs of the driver and prepare the JDBC driver jar file.
diff --git a/docs/community/collaborators.md b/docs/community/collaborators.md
index d4242627f64..c9ff9e2e816 100644
--- a/docs/community/collaborators.md
+++ b/docs/community/collaborators.md
@@ -17,6 +17,6 @@
 
 # Collaborators
 
-[PPMC Members and Committers](https://people.apache.org/phonebook.html?podling=kyuubi)
+[PMC Members and Committers](https://people.apache.org/phonebook.html?project=kyuubi)
 
-See full contributor list at [contributors](https://github.com/apache/incubator-kyuubi/graphs/contributors).
+See full contributor list at [contributors](https://github.com/apache/kyuubi/graphs/contributors).
diff --git a/docs/community/release.md b/docs/community/release.md
index edd65943b36..f3c15983511 100644
--- a/docs/community/release.md
+++ b/docs/community/release.md
@@ -131,7 +131,7 @@ The last step is to update the KEYS file with your code signing key
 https://www.apache.org/dev/openpgp.html#export-public-key
 
 ```shell
-svn checkout --depth=files "https://dist.apache.org/repos/dist/release/incubator/kyuubi" work/svn-kyuubi
+svn checkout --depth=files "https://dist.apache.org/repos/dist/release/kyuubi" work/svn-kyuubi
 
 (gpg --list-sigs "${ASF_USERNAME}@apache.org" && gpg --export --armor "${ASF_USERNAME}@apache.org") >> work/svn-kyuubi/KEYS
 
@@ -147,7 +147,7 @@ gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys ${PUBLIC_KEY} # verify
 
 ## Cut branch if for major release
 
-Kyuubi use version pattern `{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}[-{OPTIONAL_SUFFIX}]`, e.g. `1.3.0-incubating`.
+Kyuubi use version pattern `{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}[-{OPTIONAL_SUFFIX}]`, e.g. `1.7.0`.
 __Major Release__ means `MAJOR_VERSION` or `MINOR_VERSION` changed, and __Patch Release__ means `PATCH_VERSION` changed.
 
 The main step towards preparing a major release is to create a release branch. This is done via standard Git branching
@@ -155,7 +155,7 @@ mechanism and should be announced to the community once the branch is created.
 
 > Note: If you are releasing a patch version, you can ignore this step.
 
-The release branch pattern is `branch-{MAJOR_VERSION}.{MINOR_VERSION}`, e.g. `branch-1.3`.
+The release branch pattern is `branch-{MAJOR_VERSION}.{MINOR_VERSION}`, e.g. `branch-1.7`.
 
 After cutting release branch, don't forget bump version in `master` branch.
 
@@ -173,9 +173,7 @@ export RELEASE_RC_NO=<RC number, e.g. 0>
 2. Bump version.
 
 ```shell
-build/mvn versions:set -DgenerateBackupPoms=false \
-  -DnewVersion="${RELEASE_VERSION}" \
-  -Pspark-3.2,spark-block-cleaner
+build/mvn versions:set -DgenerateBackupPoms=false -DnewVersion="${RELEASE_VERSION}"
 
 git commit -am "[RELEASE] Bump ${RELEASE_VERSION}"
 ```
@@ -205,21 +203,16 @@ Filling in all the necessary information required by the form. And in the bottom
 
 ## Vote on the release candidate
 
-The release voting takes place on the Apache Kyuubi developers list (the (P)PMC is voting).
+The release voting takes place on the Apache Kyuubi developers list.
 
 - If possible, attach a draft of the release notes with the email.
 - Recommend represent voting closing time in UTC format.
-- Make sure the email is in text format and the links are correct
+- Make sure the email is in text format and the links are correct.
 
 > Note: you can generate the voting mail content for dev ML automatically via invoke the `build/release/script/dev_kyuubi_vote.sh` script. 
 
 Once the vote is done, you should also send out a summary email with the totals, with a subject that looks
-something like __[VOTE][RESULT] ....__
-
-Then, you can move the release vote on the general incubator mailing list, and generate the voting mail content automatically via invoke the `build/release/script/general_incubator_vote.sh` script.
-Also, you should send out a summary email like dev ML voting.
-
-> Note, any reason causes voting cancel. You should re-vote on the dev ML firstly.
+something like __[VOTE][RESULT] Release Apache Kyuubi ...__
 
 ## Finalize the Release
 
@@ -230,7 +223,7 @@ __Once you move the artifacts into the release folder, they cannot be removed.__
 
 After the vote passes, to upload the binaries to Apache mirrors, you move the binaries from dev directory (this should
 be where they are voted) to release directory. This "moving" is the only way you can add stuff to the actual release
-directory. (Note: only (P)PMC members can move to release directory)
+directory. (Note: only PMC members can move to release directory)
 
 Move the sub-directory in "dev" to the corresponding directory in "release". If you've added your signing key to the
 KEYS file, also update the release copy.
@@ -239,45 +232,31 @@ KEYS file, also update the release copy.
 build/release/release.sh finalize
 ```
 
-Verify that the resources are present in https://www.apache.org/dist/incubator/kyuubi/. It may take a while for them
-to be visible. This will be mirrored throughout the Apache network.
+Verify that the resources are present in https://www.apache.org/dist/kyuubi/. It may take a while for them to be visible.
+This will be mirrored throughout the Apache network.
 
 For Maven Central Repository, you can Release from the [Apache Nexus Repository Manager](https://repository.apache.org/).
-Log in, open Staging Repositories, find the one voted on, select and click Release and confirm. If successful, it should
-show up under https://repository.apache.org/content/repositories/releases/org/apache/kyuubi/ and the same under 
+Log in, open "Staging Repositories", find the one voted on, select and click "Release" and confirm. If successful, it
+should show up under https://repository.apache.org/content/repositories/releases/org/apache/kyuubi/ and the same under 
 https://repository.apache.org/content/groups/maven-staging-group/org/apache/kyuubi/ (look for the correct release version).
-After some time this will be sync’d to [Maven Central](https://search.maven.org/) automatically.
+After some time this will be synced to [Maven Central](https://search.maven.org/) automatically.
 
 ## Promote the release
 
 ### Update Website
 
-Fork and clone [Apache Kyuubi website](https://github.com/apache/incubator-kyuubi-website)
+Fork and clone [Apache Kyuubi website](https://github.com/apache/kyuubi-website)
 
 1. Add a new markdown file in `src/zh/news/`, `src/en/news/`
 2. Add a new markdown file in `src/zh/release/`, `src/en/release/`
-3. Follow [Build Document](../develop_tools/build_document.md) to build documents, then copy `apache/incubator-kyuubi`'s
-   folder `docs/_build/html` to `apache/incubator-kyuubi-website`'s folder `content/docs/r{RELEASE_VERSION}`
-
-### Add news in status file
-
-```shell
-svn checkout --depth=files "https://svn.apache.org/repos/asf/incubator/public/trunk/content/projects"
-```
-
-Add the release news
-
-```shell
-svn commit --username "${ASF_USERNAME}" --password "${ASF_PASSWORD}" --message "Update kyuubi.xml" kyuubi.xml
-```
-
-The [kyuubi status website](https://incubator.apache.org/projects/kyuubi.html) will be updated after a few minutes.
+3. Follow [Build Document](../develop_tools/build_document.md) to build documents, then copy `apache/kyuubi`'s
+   folder `docs/_build/html` to `apache/kyuubi-website`'s folder `content/docs/r{RELEASE_VERSION}`
 
 ### Create an Announcement
 
 Once everything is working, create an announcement on the website and then send an e-mail to the mailing list.
 You can generate the announcement via `build/release/script/announce.sh` automatically.
-The mailing list includes: `general@incubator.apache.org`, `announce@apache.org`, `dev@kyuubi.apache.org`, `user@spark.apache.org`.
+The mailing list includes: `announce@apache.org`, `dev@kyuubi.apache.org`, `user@spark.apache.org`.
 
 Note that, you must use the apache.org email to send announce to `announce@apache.org`.
 
@@ -290,7 +269,7 @@ Remove the deprecated dist repo directories at last.
 
 ```shell
 cd work/svn-dev
-svn delete https://dist.apache.org/repos/dist/dev/incubator/kyuubi/{RELEASE_TAG} \
+svn delete https://dist.apache.org/repos/dist/dev/kyuubi/{RELEASE_TAG} \
   --username "${ASF_USERNAME}" \
   --password "${ASF_PASSWORD}" \
   --message "Remove deprecated Apache Kyuubi ${RELEASE_TAG}" 
diff --git a/docs/connector/spark/kudu.md b/docs/connector/spark/kudu.md
index 0d3c850d703..ca02eb95cd7 100644
--- a/docs/connector/spark/kudu.md
+++ b/docs/connector/spark/kudu.md
@@ -181,5 +181,5 @@ No rows selected (0.611 seconds)
 ## References
 [https://kudu.apache.org/](https://kudu.apache.org/)
 [https://kudu.apache.org/docs/developing.html#_kudu_integration_with_spark](https://kudu.apache.org/docs/developing.html#_kudu_integration_with_spark)
-[https://github.com/apache/incubator-kyuubi](https://github.com/apache/incubator-kyuubi)
+[https://github.com/apache/kyuubi](https://github.com/apache/kyuubi)
 [https://spark.apache.org/docs/latest/sql-data-sources.html](https://spark.apache.org/docs/latest/sql-data-sources.html)
diff --git a/docs/security/authorization/spark/build.md b/docs/security/authorization/spark/build.md
index bba3894fd51..bef011867ad 100644
--- a/docs/security/authorization/spark/build.md
+++ b/docs/security/authorization/spark/build.md
@@ -48,14 +48,14 @@ build/mvn clean package -pl :kyuubi-spark-authz_2.12 -DskipTests -Dspark.version
 
 The available `spark.version`s are shown in the following table.
 
-|   Spark Version   |  Supported  |                                                              Remark                                                              |
-|:-----------------:|:-----------:|:--------------------------------------------------------------------------------------------------------------------------------:|
-|      master       |      √      |                                                                -                                                                 |
-|       3.3.x       |      √      |                                                                -                                                                 |
-|       3.2.x       |      √      |                                                                -                                                                 |
-|       3.1.x       |      √      |                                                                -                                                                 |
-|       3.0.x       |      √      |                                                                -                                                                 |
-| 2.4.x and earlier |      ×      | [PR 2367](https://github.com/apache/incubator-kyuubi/pull/2367) is used to track how we work with older releases with scala 2.11 |
+|   Spark Version   |  Supported  |                                                         Remark                                                         |
+|:-----------------:|:-----------:|:----------------------------------------------------------------------------------------------------------------------:|
+|      master       |      √      |                                                           -                                                            |
+|       3.3.x       |      √      |                                                           -                                                            |
+|       3.2.x       |      √      |                                                           -                                                            |
+|       3.1.x       |      √      |                                                           -                                                            |
+|       3.0.x       |      √      |                                                           -                                                            |
+| 2.4.x and earlier |      ×      | [PR 2367](https://github.com/apache/kyuubi/pull/2367) is used to track how we work with older releases with scala 2.11 |
 
 Currently, Spark released with Scala 2.12 are supported.