diff --git a/.github/workflows/sync-fork.yml b/.github/workflows/sync-fork.yml
new file mode 100644
index 0000000000..24693c794e
--- /dev/null
+++ b/.github/workflows/sync-fork.yml
@@ -0,0 +1,19 @@
+name: Sync Fork
+
+on:
+  schedule:
+    - cron: '*/60 * * * *' # run hourly
+  workflow_dispatch: # or run on button click
+
+jobs:
+  sync:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: tgymnich/fork-sync@v1.8
+        with:
+          token: ${{ secrets.SYNC_FORK_TOKEN }}
+          owner: microsoft
+          base: main
+          head: main
diff --git a/.gitignore b/.gitignore
index 2f4cff580f..6fd1293a29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,7 @@ lcov.info
 /src/ApiService/ApiService/Properties/PublishProfiles/*
 /src/ApiService/ApiService/Properties/ServiceDependencies/*
 
-.vs
\ No newline at end of file
+.vs
+
+# Local fork tools, not to be merged back into main repo
+/.github/workflows/sync-fork.yml
diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock
index fdee0ea95d..0e17257ec5 100644
--- a/src/agent/Cargo.lock
+++ b/src/agent/Cargo.lock
@@ -543,7 +543,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-utils",
  "lazy_static",
- "memoffset",
+ "memoffset 0.6.4",
  "scopeguard",
 ]
 
@@ -617,7 +617,7 @@ version = "3.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173"
 dependencies = [
- "nix",
+ "nix 0.25.1",
  "winapi 0.3.9",
 ]
 
@@ -1673,6 +1673,15 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.16"
@@ -1802,18 +1811,32 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
 
 [[package]]
 name = "nix"
-version = "0.25.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
 dependencies = [
  "autocfg",
  "bitflags",
  "cfg-if 1.0.0",
  "libc",
- "memoffset",
+ "memoffset 0.6.4",
  "pin-utils",
 ]
 
+[[package]]
+name = "nix"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+dependencies = [
+ "bitflags",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset 0.7.1",
+ "pin-utils",
+ "static_assertions",
+]
+
 [[package]]
 name = "nom"
 version = "5.1.2"
@@ -1940,7 +1963,7 @@ dependencies = [
  "input-tester",
  "lazy_static",
  "log",
- "nix",
+ "nix 0.26.2",
  "notify",
  "onefuzz-telemetry",
  "pete",
@@ -1986,7 +2009,7 @@ dependencies = [
  "futures",
  "ipc-channel",
  "log",
- "nix",
+ "nix 0.26.2",
  "onefuzz",
  "onefuzz-telemetry",
  "reqwest",
@@ -2279,8 +2302,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "493eb0f2954de9a30ee85b01891f6519e9d065464eaab79aff65d949f44b7850"
 dependencies = [
  "libc",
- "memoffset",
- "nix",
+ "memoffset 0.6.4",
+ "nix 0.25.1",
  "thiserror",
 ]
 
diff --git a/src/agent/onefuzz-agent/Cargo.toml b/src/agent/onefuzz-agent/Cargo.toml
index 824601d6a2..09a9c0f639 100644
--- a/src/agent/onefuzz-agent/Cargo.toml
+++ b/src/agent/onefuzz-agent/Cargo.toml
@@ -35,7 +35,7 @@ dynamic-library = { path = "../dynamic-library" }
 
 [target.'cfg(target_family = "unix")'.dependencies]
 users = "0.11"
-nix = "0.25"
+nix = "0.26"
 
 [target.'cfg(target_family = "windows")'.dependencies]
 winapi = "0.3"
diff --git a/src/agent/onefuzz/Cargo.toml b/src/agent/onefuzz/Cargo.toml
index abcd4ed0b8..d5992050e4 100644
--- a/src/agent/onefuzz/Cargo.toml
+++ b/src/agent/onefuzz/Cargo.toml
@@ -55,7 +55,7 @@ winapi = { version = "0.3", features = ["impl-default", "psapi"] }
 
 [target.'cfg(target_family = "unix")'.dependencies]
 cpp_demangle = "0.4"
-nix = "0.25"
+nix = "0.26"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 pete = "0.9"