diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d578b082ff55..34dd624249a0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -64,6 +64,9 @@ jobs:
           export JEKYLL_DESTINATION=../build
           export JEKYLL_ENV=production
           export JEKYLL_EXTRA_CONFIG=_extra_config.yml
+          if [ "${GITHUB_REPOSITORY}" != "apache/arrow-site" ]; then
+            export JEKYLL_FUTURE=1
+          fi
           bundle exec rake generate
       - name: Checkout asf-site
         uses: actions/checkout@v6
diff --git a/Rakefile b/Rakefile
index 6284c9efdd9d..502278706556 100644
--- a/Rakefile
+++ b/Rakefile
@@ -39,11 +39,12 @@ end
 
 desc "Serve site locally"
 task :serve => webpacked_js do
-  sh("jekyll",
-     "serve",
-     "--incremental",
-     "--livereload",
-     "--host", ENV["HOST"] || "127.0.0.1")
+  command_line = ["jekyll", "serve"]
+  command_line << "--incremental"
+  command_line << "--livereload"
+  command_line << "--host=#{ENV["HOST"] || "127.0.0.1"}"
+  command_line << "--future"
+  sh(*command_line)
 end
 
 task :default => :serve