diff --git a/.github/workflows/build-esmf-docs.yml b/.github/workflows/build-esmf-docs.yml
index b3b89c956e..d94aa2ee95 100644
--- a/.github/workflows/build-esmf-docs.yml
+++ b/.github/workflows/build-esmf-docs.yml
@@ -43,14 +43,16 @@ jobs:
         path: ${{ github.workspace }}/artifacts
        
     - name: Setup deployment
+      env:
+        SSH_AUTH_SOCK: ${{runner.temp}}/ssh_agent.sock
       run: | 
         mkdir -p ~/.ssh
         if [ -z "${{secrets.ESMF_WEB_DEPLOY_KEY}}" ]; then
           echo "ERROR: Missing ESMF_WEB_DEPLOY_KEY!"
           exit 1
         fi
-        eval `ssh-agent -s`
-        ssh-add - <<< '${{secrets.ESMF_WEB_DEPLOY_KEY}}'
+        ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+        ssh-add - <<< "${{secrets.ESMF_WEB_DEPLOY_KEY}}"
         git config --global user.name "github-actions[bot]"
         git config --global user.email "github-actions[bot]@users.noreply.github.com"
         git clone --depth=1 git@github.com:esmf-org/esmf-org.github.io.git ${{ github.workspace }}/esmf-org.github.io
@@ -72,6 +74,8 @@ jobs:
         cp -rf ./dev_guide/dev_guide/* ${{ github.workspace }}/esmf-org.github.io/docs/nightly/${{ github.ref_name }}/dev_guide/
         
     - name: Commit and publish docs
+      env:
+        SSH_AUTH_SOCK: ${{runner.temp}}/ssh_agent.sock
       run: | 
         cd ${{ github.workspace }}/esmf-org.github.io
         git add .
diff --git a/.github/workflows/build-esmpy-docs.yml b/.github/workflows/build-esmpy-docs.yml
index 79420185e6..9cafa3ef01 100644
--- a/.github/workflows/build-esmpy-docs.yml
+++ b/.github/workflows/build-esmpy-docs.yml
@@ -43,14 +43,16 @@ jobs:
         path: ${{ github.workspace }}/artifacts
     
     - name: Setup deployment
+      env:
+        SSH_AUTH_SOCK: ${{runner.temp}}/ssh_agent.sock
       run: | 
         mkdir -p ~/.ssh
         if [ -z "${{secrets.ESMPY_WEB_DEPLOY_KEY}}" ]; then
           echo "ERROR: Missing ESMPY_WEB_DEPLOY_KEY!"
           exit 1
         fi
-        eval `ssh-agent -s`
-        ssh-add - <<< '${{secrets.ESMPY_WEB_DEPLOY_KEY}}'
+        ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+        ssh-add - <<< "${{secrets.ESMPY_WEB_DEPLOY_KEY}}"
         git config --global user.name "github-actions[bot]"
         git config --global user.email "github-actions[bot]@users.noreply.github.com"
         git clone --depth=1 git@github.com:esmf-org/esmpy_doc.git ${{ github.workspace }}/esmpy_doc
@@ -66,6 +68,8 @@ jobs:
         cp -rf latex/ESMPy.pdf ${{ github.workspace }}/esmpy_doc/docs/nightly/${{ github.ref_name }}/
 
     - name: Commit and publish docs
+      env:
+        SSH_AUTH_SOCK: ${{runner.temp}}/ssh_agent.sock
       run: |
         cd ${{ github.workspace }}/esmpy_doc
         git add .