diff --git a/.asf.yaml b/.asf.yaml
index 65592acbb1813..261f584535b5f 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -39,3 +39,7 @@ github:
     rebase: false    
   features:
     issues: true        
+
+publish:
+  whoami: asf-site
+  subdir: datafusion
\ No newline at end of file
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 8f40aa38e3f59..eca6d3c99c9c1 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -2,6 +2,7 @@ on:
   push:
     branches:
       - master
+      - issue-5500-asf.yaml-docs
     paths:
       - .github/workflows/docs.yaml
       - docs/**
@@ -16,12 +17,11 @@ jobs:
       - name: Checkout docs sources
         uses: actions/checkout@v3
 
-      - name: Checkout docs target branch
+      - name: Checkout asf-site branch
         uses: actions/checkout@v3
         with:
-          repository: apache/arrow-site
           ref: asf-site
-          path: docs-target
+          path: asf-site
 
       - name: Setup Python
         uses: actions/setup-python@v4
@@ -45,9 +45,12 @@ jobs:
       - name: Copy & push the generated HTML
         run: |
           set -x
-          cd docs-target/
-          rm -rf datafusion/*
-          cp -rT ../docs/build/html/ datafusion/
+          cd asf-site/
+          # delete anything but: 1) '.'; 2) '..'; 3) .git/
+          find ./ | grep -vE "^./$|^../$|^./.git" | xargs rm -rf
+          cp ../.asf.yaml .
+          cp -rT ../docs/build/html/ .
+          git add .
           git status --porcelain
           if [ "$(git status --porcelain)" != "" ]; then
             git config user.name "github-actions[bot]"