diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml
index 32adc0c..bd9da0c 100644
--- a/.gitea/workflows/build-and-deploy.yml
+++ b/.gitea/workflows/build-and-deploy.yml
@@ -17,13 +17,11 @@ jobs:
         uses: actions/checkout@v4
       - name: Build website content
         run: hugo
-      - name: Setup ssh agent
-        run: eval $(ssh-agent -s)
-      - name: Add private key to agent
-        run: echo "${{ secrets.PRIVATE_KEY }}" | ssh-add - > /dev/null
-      - name: Create tmp .ssh directory
-        run: mkdir -p ~/.ssh
-      - name: Ensure perms on tmp .ssh directory
-        run: chmod 0700 ~/.ssh
+      - name: Setup the hostname with the private key that we have
+        run: mkdir -p ~/.ssh/ && ssh-keyscan git.shockrah.xyz >> ~/.ssh/known_hosts
+      - name: Setup SSH to copy files up to remote webserver
+        uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.PRIVATE_KEY }}
       - name: SCP Files to resume web server
         run: "scp -o UserKnownHostsFile=/dev/null -r public/ $ssh_target:$remote_path"