diff --git a/_includes/img-url.html b/_includes/img-url.html
index 1483652..2f8d401 100644
--- a/_includes/img-url.html
+++ b/_includes/img-url.html
@@ -29,9 +29,9 @@
     %}
 
     {% if include.absolute %}
-      {% assign url = site.url | append: site.base_url | append: url %}
+      {% assign url = site.url | append: site.baseurl | append: url %}
     {% else %}
-      {% assign url = site.base_url | append: url %}
+      {% assign url = site.baseurl | append: url %}
     {% endif %}
   {% endunless %}
 {%- endif -%}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 8d6930d..73c7421 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.5.2](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.1...v6.5.2) (2024-02-29)
+
+### Bug Fixes
+
+* correct the base URL parameter name ([#1576](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1576)) ([19d6baf](https://github.com/cotes2020/jekyll-theme-chirpy/commit/19d6bafbe1a60614e0d63b961bc73c342a9f6f33)), closes [#1553](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1553)
+
 ## [6.5.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.0...v6.5.1) (2024-02-26)
 
 ### Bug Fixes
diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec
index 9e6f1dd..714b24f 100644
--- a/jekyll-theme-chirpy.gemspec
+++ b/jekyll-theme-chirpy.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-theme-chirpy"
-  spec.version       = "6.5.1"
+  spec.version       = "6.5.2"
   spec.authors       = ["Cotes Chung"]
   spec.email         = ["cotes.chung@gmail.com"]
 
diff --git a/package.json b/package.json
index 1c589e9..7d9f252 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jekyll-theme-chirpy",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.",
   "repository": {
     "type": "git",
diff --git a/tools/release b/tools/release
index bb54a0b..9ca63dc 100755
--- a/tools/release
+++ b/tools/release
@@ -151,8 +151,10 @@ branch() {
   fi
 }
 
-## Build a gem package
+## Build a Gem package
 build_gem() {
+  git checkout "$PROD_BRANCH"
+
   # Remove unnecessary theme settings
   sed -i "s/^img_cdn:.*/img_cdn:/;s/^avatar:.*/avatar:/" _config.yml
   rm -f ./*.gem
@@ -168,6 +170,9 @@ build_gem() {
 
   # restore the dist files for future development
   mkdir -p "$JS_DIST" && cp "$BACKUP_PATH"/* "$JS_DIST"
+
+  # back to the default branch
+  git checkout "$DEFAULT_BRANCH"
 }
 
 main() {