diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
index b3a2b9d93a..a98efeea15 100644
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -32,5 +32,6 @@ jobs:
           git config user.signingkey "${{ runner.temp }}/signing_key"
       - name: Apply patches and Push
         run: |
-          git am -S --keep-cr --signoff <(curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch)
+          curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch
+          git am -S --keep-cr --signoff < pr.patch
           git push -u origin --all
diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml
index 2c614f2aca..f8afc492fc 100644
--- a/.github/workflows/update-comps.yml
+++ b/.github/workflows/update-comps.yml
@@ -17,9 +17,13 @@ jobs:
       image: ghcr.io/terrapkg/builder:main
     steps:
       - uses: actions/checkout@v3
+      - id: get-branch
+        uses: grandmasterdev/github-action-get-branch@latest
       - name: Push to subatomic
         run: |
+          branch=${{steps.get-branch.outputs.branch-name}}
+          ver=${branch/f/}
           subatomic-cli upload-comps \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra37 comps.xml
+            "terra${ver}" comps.xml
diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml
index 32d088c92a..6039147fab 100644
--- a/.github/workflows/update-nightly.yml
+++ b/.github/workflows/update-nightly.yml
@@ -38,5 +38,14 @@ jobs:
             git config user.signingkey "${{ runner.temp }}/signing_key"
             msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
             git commit -S -a -m "$msg"
+            git format-patch HEAD^
+            git checkout f38
+            git apply *.patch || true
+            git add anda
+            git commit -S -a -m "$msg"
+            git checkout f37
+            git apply *.patch || true
+            git add anda
+            git commit -S -a -m "$msg"
             git push -u origin --all
           fi