diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9466cb083..209ed90de 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,9 +1,8 @@
 name: Build Dalamud
 on: [push, pull_request, workflow_dispatch]
 
-# Globally blocking because of git pushes in deploy step
 concurrency:
-  group: build_dalamud_${{ github.repository_owner }}
+  group: build_dalamud_${{ github.ref_name }}
   cancel-in-progress: false
 
 jobs:
diff --git a/.github/workflows/rollup.yml b/.github/workflows/rollup.yml
index 8fe049ad7..f4e013258 100644
--- a/.github/workflows/rollup.yml
+++ b/.github/workflows/rollup.yml
@@ -1,8 +1,8 @@
 name: Rollup changes to next version
 on:
-  push:
-    branches:
-      - master
+#  push:
+#    branches:
+#      - master
   workflow_dispatch:
 
 jobs:
diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index 305c1629e..c0a862043 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit 305c1629eed0b1cdca5efb102e37de93d592d155
+Subproject commit c0a8620439e647ccf443710e81acce021b299bf5
diff --git a/lib/Lumina.Excel b/lib/Lumina.Excel
index c74841abc..d8d0b53e2 160000
--- a/lib/Lumina.Excel
+++ b/lib/Lumina.Excel
@@ -1 +1 @@
-Subproject commit c74841abce0830ead4437ed2f560bceb6235a538
+Subproject commit d8d0b53e27393f509ac5397511cb8d251d562277