diff --git a/.github/workflows/pr-preview.yml b/.github/workflows/pr-preview.yml
index afec6f84d6..6f91042683 100644
--- a/.github/workflows/pr-preview.yml
+++ b/.github/workflows/pr-preview.yml
@@ -25,10 +25,10 @@ jobs:
           git checkout tmp
 
       - run: |
-          git rev-parse origin/main
+          git rev-parse origin/6.5.x
           git rev-parse HEAD
-          git rev-parse origin/main..HEAD
-          git log origin/main..HEAD --format="%b"
+          git rev-parse origin/6.5.x..HEAD
+          git log origin/6.5.x..HEAD --format="%b"
 
       # Yes, we really want to checkout the PR
       # Injected by generate-workflows.js
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 63cf57fc59..0f09b08e7c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: release
 on:
   push:
     branches:
-      - main
+      - 6.5.x
 jobs:
   build-deploy:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
diff --git a/README.md b/README.md
index 5c81dbd219..55d90acb58 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # PatternFly 
- 
+    
 ## Contributing
 
 We welcome contributions to PatternFly! Please read our [Contributing Guide](https://pf-core-staging.patternfly.org/contribution) to learn how to get started, submit issues, and contribute code to the project. 
diff --git a/release.config.js b/release.config.js
index 7b7b50fbe3..e6a70ec95d 100644
--- a/release.config.js
+++ b/release.config.js
@@ -1,26 +1,29 @@
 module.exports = {
+  // Branch order is significant: each line must be lower than the next. Maintenance
+  // lines (5.x, 6.5.x) must appear before `main`, or semantic-release intersects ranges
+  // incorrectly and fails with EINVALIDNEXTVERSION (e.g. ">=6.5.0 <5.4.0").
   branches: [
     'do-not-delete',
     { name: 'v5', channel: 'prerelease-v5', range: '5.x' },
+    { name: '6.5.x', channel: 'prerelease-bugfix', range: '>=6.5.0 <6.6.0' },
     { name: 'main', channel: 'prerelease', prerelease: 'prerelease' }
   ],
   analyzeCommits: {
     preset: 'angular'
   },
   plugins: [
-    [
-      '@semantic-release/commit-analyzer',
+    ['@semantic-release/commit-analyzer',
       {
         preset: 'angular',
-        parserOpts: {
-          noteKeywords: ['BREAKING-CHANGE']
-        }
+        releaseRules: [
+          { type: 'feat', release: 'patch' },
+          { type: 'fix', release: 'patch' }
+        ]
       }
     ],
     '@semantic-release/release-notes-generator',
-    '@semantic-release/github',
+    ['@semantic-release/github', { successComment: false, failComment: false }],
     ['@semantic-release/npm', { pkgRoot: 'dist' }]
   ],
-  tagFormat: 'prerelease-v${version}',
-  dryRun: false
+  tagFormat: 'patch-v${version}'
 };