diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 9d8d764d29..52b2e1fc7b 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -60,7 +60,7 @@ jobs:
           gem install bundler -n /usr/local/bin
           bundle install --retry=100
           git clone https://github.com/apache/orc.git -b asf-site target
-          bundle exec jekyll build -b https://apache.github.io/orc
+          bundle exec jekyll build -b /orc
       - name: Setup Pages
         uses: actions/configure-pages@v5
       - name: Upload artifact
diff --git a/site/_includes/docs_ul.html b/site/_includes/docs_ul.html
index 8e93fee854..a11fdbadb8 100644
--- a/site/_includes/docs_ul.html
+++ b/site/_includes/docs_ul.html
@@ -12,7 +12,7 @@
 
   {% for p in site.docs %}
     {% if p.url == item_url %}
-      <li class="{{ c }}"><a href="{{ p.url }}">{{ p.title }}</a></li>
+      <li class="{{ c }}"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></li>
       {% break %}
     {% endif %}
   {% endfor %}
diff --git a/site/_includes/header.html b/site/_includes/header.html
index 27f24f704e..04d5ebde21 100644
--- a/site/_includes/header.html
+++ b/site/_includes/header.html
@@ -5,7 +5,7 @@
   <div class="grid">
     <div class="unit one-quarter center-on-mobiles">
       <h1>
-        <a href="/">
+        <a href="{{ site.baseurl }}/">
           <span class="sr-only">Apache ORC</span>
           <img src="{{ site.baseurl }}/img/logo.png" width="249" height="101" alt="ORC Logo">
         </a>
diff --git a/site/_includes/news_contents.html b/site/_includes/news_contents.html
index e7256ab809..85546b49c5 100644
--- a/site/_includes/news_contents.html
+++ b/site/_includes/news_contents.html
@@ -12,7 +12,7 @@ <h4>Recent Releases</h4>
     <ul>
       {% for post in site.categories.release limit:5 %}
       <li class="{% if page.title == post.title %}current{% endif %}">
-        <a href="{{ post.url }}">Version {{ post.version }}</a>
+        <a href="{{ site.baseurl }}{{ post.url }}">Version {{ post.version }}</a>
       </li>
       {% endfor %}
     </ul>
@@ -21,7 +21,7 @@ <h4>Other News</h4>
         {% for post in site.posts %}
         {% unless post.categories contains 'release' %}
         <li class="{% if page.title == post.title %}current{% endif %}">
-          <a href="{{ post.url }}">{{ post.title }}</a>
+          <a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a>
         </li>
         {% endunless %}
         {% endfor %}