diff --git a/setup-deploy-keys/src/deploy.rs b/setup-deploy-keys/src/deploy.rs
index f612c7ede..37988582a 100644
--- a/setup-deploy-keys/src/deploy.rs
+++ b/setup-deploy-keys/src/deploy.rs
@@ -1,71 +1,75 @@
 use std::env;
 use std::fs;
-use std::io::{Read, Write};
+use std::io::Write;
 use std::os::unix::net::UnixStream;
-use std::os::unix::prelude::*;
 use std::process::{Command, Stdio};
 
 fn main() {
     let slug = env::var("BUILD_REPOSITORY_ID")
         .or_else(|_| env::var("GITHUB_REPOSITORY"))
-        .unwrap();
-    let key = env::var("GITHUB_DEPLOY_KEY").unwrap();
+        .unwrap_or_else(|_| "unknown".to_string());
 
-    let socket = "/tmp/.github-deploy-socket";
-    run(Command::new("ssh-agent").arg("-a").arg(socket));
-    while UnixStream::connect(socket).is_err() {
-        std::thread::sleep(std::time::Duration::from_millis(5));
-    }
+    let msg = env::var("BUILD_SOURCEVERSIONMESSAGE")
+        .or_else(|_| env::var("GITHUB_COMMIT_MESSAGE"))
+        .unwrap_or_else(|_| "Deploy from CI".to_string());
 
-    let mut decode = Command::new("base64")
-        .arg("-d")
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .spawn()
-        .unwrap();
-    decode
-        .stdin
-        .take()
-        .unwrap()
-        .write_all(key.as_bytes())
-        .unwrap();
-    let mut key = Vec::new();
-    decode.stdout.take().unwrap().read_to_end(&mut key).unwrap();
-    decode.wait().unwrap();
+    let mut sock_path = env::temp_dir();
+    sock_path.push("deploy.sock");
 
-    let path = "_the_key";
-    fs::write(path, key).unwrap();
-    fs::set_permissions(path, fs::Permissions::from_mode(0o600)).unwrap();
-    run(Command::new("ssh-add")
-        .arg(path)
-        .env("SSH_AUTH_SOCK", socket));
-    fs::remove_file(path).unwrap();
+    let stream = match UnixStream::connect(&sock_path) {
+        Ok(s) => s,
+        Err(e) => {
+            eprintln!("Failed to connect to socket: {}", e);
+            std::process::exit(1);
+        }
+    };
 
-    let sha = env::var("BUILD_SOURCEVERSION")
-        .or_else(|_| env::var("GITHUB_SHA"))
-        .unwrap();
-    let msg = format!("Deploy {sha} to gh-pages");
+    let mut stream = stream;
+    let payload = format!("deploy {}", slug);
+    if let Err(e) = stream.write_all(payload.as_bytes()) {
+        eprintln!("Failed to send deploy request: {}", e);
+        std::process::exit(1);
+    }
 
-    drop(fs::remove_dir_all(".git"));
+    let _ = fs::remove_dir_all(".git");
     run(Command::new("git").arg("init"));
+
     run(Command::new("git")
         .arg("config")
         .arg("user.name")
-        .arg("Deploy from CI"));
-    run(Command::new("git").arg("config").arg("user.email").arg(""));
-    run(Command::new("git").arg("add").arg("."));
-    run(Command::new("git").arg("commit").arg("-m").arg(&msg));
+        .arg("CI Bot"));
     run(Command::new("git")
-        .arg("push")
-        .arg(format!("git@github.com:{slug}"))
-        .arg("master:gh-pages")
-        .env("GIT_SSH_COMMAND", "ssh -o StrictHostKeyChecking=no")
-        .env("SSH_AUTH_SOCK", socket)
-        .arg("-f"));
+        .arg("config")
+        .arg("user.email")
+        .arg("ci@example.com"));
+
+    run(Command::new("git").arg("add").arg("."));
+
+    let status_output = run(Command::new("git").arg("status").arg("--porcelain"));
+    if status_output.trim().is_empty() {
+        println!("No changes to commit, skipping commit.");
+    } else {
+        run(Command::new("git").arg("commit").arg("-m").arg(&msg));
+    }
 }
 
-fn run(cmd: &mut Command) {
-    println!("{cmd:?}");
-    let status = cmd.status().unwrap();
-    assert!(status.success());
+// Helper
+fn run(cmd: &mut Command) -> String {
+    let output = cmd
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .output()
+        .expect("failed to execute command");
+
+    if !output.status.success() {
+        eprintln!(
+            "Command failed: {:?}\nstdout: {}\nstderr: {}",
+            cmd,
+            String::from_utf8_lossy(&output.stdout),
+            String::from_utf8_lossy(&output.stderr)
+        );
+        std::process::exit(1);
+    }
+
+    String::from_utf8_lossy(&output.stdout).to_string()
 }