diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 59c241deb7..fdedc2fb04 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -89,18 +89,20 @@ jobs:
       - name: Upload packages to subatomic
         if: github.event_name == 'push'
         run: |
+          subrepo="${{ matrix.pkg.labels.subrepo }}"
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-${{ matrix.pkg.labels.subrepo }}' || '' }} anda-build/rpm/rpms/*
+            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-$subrepo' || '' }} anda-build/rpm/rpms/*
 
       - name: Upload source packages to subatomic
         if: github.event_name == 'push'
         run: |
+          subrepo="${{ matrix.pkg.labels.subrepo }}"
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-${{ matrix.pkg.labels.subrepo }}' || '' }}-source anda-build/rpm/srpm/*
+            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-$subrepo' || '' }}-source anda-build/rpm/srpm/*
 
       - name: Notify Madoguchi (Success)
         if: success() && github.event_name == 'push'
diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml
index fd8a6a04e1..daa11b0682 100644
--- a/.github/workflows/json-build.yml
+++ b/.github/workflows/json-build.yml
@@ -60,17 +60,19 @@ jobs:
 
       - name: Upload packages to subatomic
         run: |
+          subrepo="${{ matrix.pkg.labels.subrepo }}"
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }} anda-build/rpm/rpms/*
+            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-$subrepo' || '' }} anda-build/rpm/rpms/*
 
       - name: Upload source packages to subatomic
         run: |
+          subrepo="${{ matrix.pkg.labels.subrepo }}"
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }}-source anda-build/rpm/srpm/*
+            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-$subrepo' || '' }}-source anda-build/rpm/srpm/*
 
       - name: Notify Madoguchi (Success)
         if: success()