diff --git a/.github/mergify.yml b/.github/mergify.yml
index 813908c8bb0..6aa7a4a36b6 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -110,3 +110,11 @@ pull_request_rules:
       backport:
         branches:
           - v16.x
+  - name: backport patches to v17.x branch
+    conditions:
+      - base=main
+      - label=A:backport/v17.x
+    actions:
+      backport:
+        branches:
+          - v17.x
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d82a2341046..d634ad3c9f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,7 +40,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## v17.0.0
 
 ### API breaks