diff --git a/.github/workflows/cd-deploy.yaml b/.github/workflows/cd-deploy.yaml
index 5299f4d6..fc5dea73 100644
--- a/.github/workflows/cd-deploy.yaml
+++ b/.github/workflows/cd-deploy.yaml
@@ -16,9 +16,16 @@ concurrency:
 
 jobs:
   deploy-syftbox-server:
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
+    runs-on: syftbox-sh-linux-x64
 
     steps:
+      - name: Install Git
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install git -y
+
       - name: Checkout SyftBox repo
         uses: actions/checkout@v4
 
diff --git a/.github/workflows/cd-release.yaml b/.github/workflows/cd-release.yaml
index b7d40920..04d6d319 100644
--- a/.github/workflows/cd-release.yaml
+++ b/.github/workflows/cd-release.yaml
@@ -39,9 +39,16 @@ jobs:
 
   deploy-syftbox:
     needs: [call-pr-tests]
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
+    runs-on: syftbox-sh-linux-x64
 
     steps:
+      - name: Install Git
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install git -y
+
       - name: Checkout SyftBox repo with github token
         uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/pr-tests.yaml b/.github/workflows/pr-tests.yaml
index dfd76594..3606a5e2 100644
--- a/.github/workflows/pr-tests.yaml
+++ b/.github/workflows/pr-tests.yaml
@@ -23,12 +23,24 @@ jobs:
     strategy:
       max-parallel: 99
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        # os: [ubuntu-latest, macos-latest]
+        runner: [syftbox-sh-linux-x64, syftbox-sh-mac-arm64]
         python-version: ["3.12", "3.11", "3.10"]
       fail-fast: false
 
-    runs-on: ${{ matrix.os }}
+    # runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.runner }}
     steps:
+      - name: Permission to home directory
+        run: |
+          sudo chown -R $USER:$USER $HOME
+
+      - name: Install Git
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install git -y
+
       - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
diff --git a/syftbox/client/client.py b/syftbox/client/client.py
index 7ffb9a6a..85c10d00 100644
--- a/syftbox/client/client.py
+++ b/syftbox/client/client.py
@@ -236,6 +236,7 @@ def sync_on_event(event: FileSystemEvent):
         run_plugin("sync", event)
 
     watch_dir = Path(app.shared_state.client_config.sync_folder)
+    watch_dir.mkdir(parents=True, exist_ok=True)
     event_handler = AnyFileSystemEventHandler(
         watch_dir,
         callbacks=[sync_on_event],