diff --git a/.github/workflows/build_packages_cron.yaml b/.github/workflows/build_packages_cron.yaml
index b7d05ad94..27f4698b6 100644
--- a/.github/workflows/build_packages_cron.yaml
+++ b/.github/workflows/build_packages_cron.yaml
@@ -23,6 +23,7 @@ jobs:
         profile:
           - ['emqx', 'master']
           - ['emqx', 'release-57']
+          - ['emqx', 'release-58']
         os:
           - ubuntu22.04
           - amzn2023
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index f086b97f6..f6077262f 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -24,6 +24,7 @@ jobs:
         branch:
           - master
           - release-57
+          - release-58
         language:
           - cpp
           - python
diff --git a/.github/workflows/green_master.yaml b/.github/workflows/green_master.yaml
index 8479ea5ed..a5317027b 100644
--- a/.github/workflows/green_master.yaml
+++ b/.github/workflows/green_master.yaml
@@ -24,6 +24,7 @@ jobs:
         ref:
           - master
           - release-57
+          - release-58
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl
index c8e84ea06..7979d00fd 100644
--- a/apps/emqx/include/emqx_release.hrl
+++ b/apps/emqx/include/emqx_release.hrl
@@ -32,7 +32,7 @@
 %% `apps/emqx/src/bpapi/README.md'
 
 %% Opensource edition
--define(EMQX_RELEASE_CE, "5.7.1").
+-define(EMQX_RELEASE_CE, "5.8.0-alpha.1").
 
 %% Enterprise edition
--define(EMQX_RELEASE_EE, "5.7.1").
+-define(EMQX_RELEASE_EE, "5.8.0-alpha.1").
diff --git a/deploy/charts/emqx-enterprise/Chart.yaml b/deploy/charts/emqx-enterprise/Chart.yaml
index cd795d4f4..3c25b9ebc 100644
--- a/deploy/charts/emqx-enterprise/Chart.yaml
+++ b/deploy/charts/emqx-enterprise/Chart.yaml
@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 5.7.1
+version: 5.8.0-alpha.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 5.7.1
+appVersion: 5.8.0-alpha.1
diff --git a/deploy/charts/emqx/Chart.yaml b/deploy/charts/emqx/Chart.yaml
index d31648f2f..49a3f7c84 100644
--- a/deploy/charts/emqx/Chart.yaml
+++ b/deploy/charts/emqx/Chart.yaml
@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 5.7.1
+version: 5.8.0-alpha.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 5.7.1
+appVersion: 5.8.0-alpha.1
diff --git a/scripts/rel/cut.sh b/scripts/rel/cut.sh
index 1affd48bf..8c8899b91 100755
--- a/scripts/rel/cut.sh
+++ b/scripts/rel/cut.sh
@@ -135,6 +135,12 @@ rel_branch() {
         e5.7.*)
             echo 'release-57'
             ;;
+        v5.8.*)
+            echo 'release-58'
+            ;;
+        e5.8.*)
+            echo 'release-58'
+            ;;
         *)
             logerr "Unsupported version tag $TAG"
             exit 1
diff --git a/scripts/rel/sync-remotes.sh b/scripts/rel/sync-remotes.sh
index 430021a79..c986535ce 100755
--- a/scripts/rel/sync-remotes.sh
+++ b/scripts/rel/sync-remotes.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 # ensure dir
 cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/../.."
 
-BASE_BRANCHES=( 'release-57' 'release-56' 'release-55' 'master' )
+BASE_BRANCHES=( 'release-58' 'release-57' 'release-56' 'release-55' 'master' )
 
 usage() {
     cat <<EOF
@@ -21,6 +21,7 @@ options:
     * release-55: []        # no upstream for 5.5 opensource edition
     * release-56: []        # no upstream for 5.6 opensource edition
     * release-57: []        # no upstream for 5.7 opensource edition
+    * release-58: []        # no upstream for 5.8 opensource edition
     * master: [release-5x]  # sync release-5x to master
 
   -b|--base:
@@ -162,8 +163,11 @@ upstream_branches() {
         release-57)
             remote_ref "$base"
             ;;
+        release-58)
+            remote_ref "$base"
+            ;;
         master)
-            remote_refs "$base" 'release-55' 'release-56' 'release-57'
+            remote_refs "$base" 'release-55' 'release-56' 'release-57' 'release-58'
             ;;
     esac
 }