diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml
new file mode 100644
index 000000000..6290357f1
--- /dev/null
+++ b/.github/workflows/update-submodules.yml
@@ -0,0 +1,46 @@
+name: Check for FFXIVCS changes
+on: 
+  schedule:
+    - cron: "0 0 */1 * *"
+  workflow_dispatch:
+
+jobs:
+  check:
+    name: FFXIVCS Check
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        branches: [master]
+
+    defaults: 
+      run:
+        shell: bash
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        submodules: true
+        ref: ${{ matrix.branches }}
+        token: ${{ secrets.PAT }}
+    - name: Create update branch
+      run: git checkout -b csupdate/${{ matrix.branches }}
+    - name: Initialize mandatory git config
+      run: |
+        git config --global user.name "github-actions[bot]"
+        git config --global user.email noreply@github.com
+        git config --global pull.rebase false
+    - name: Update submodule
+      run: |
+        git checkout -b csupdate-${{ matrix.branches }}
+        cd lib/FFXIVClientStructs
+        git fetch
+        git reset --hard origin/main
+        cd ../..
+        git add lib/FFXIVClientStructs
+        git commit --message "Update ClientStructs"
+        git push origin csupdate-${{ matrix.branches }}
+    - name: Create PR
+      run: |
+        echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
+        gh pr create --head csupdate-${{ matrix.branches }} --title "[${{ matrix.branches }}] Update ClientStructs" --body "" --base ${{ matrix.branches }}
diff --git a/.gitmodules b/.gitmodules
index 3860651bd..e265f5fc0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/goatcorp/ImGuiScene
 [submodule "lib/FFXIVClientStructs"]
 	path = lib/FFXIVClientStructs
-	url = https://github.com/goatcorp/FFXIVClientStructs.git
+	url = https://github.com/aers/FFXIVClientStructs.git
 [submodule "lib/Nomade040-nmd"]
 	path = lib/Nomade040-nmd
 	url = https://github.com/Nomade040/nmd.git